Skip to content

Commit 12c4b4d

Browse files
authored
Merge pull request #4313 from Flow-Launcher/InitProgressbarAnimation_Null
Move progress bar animation init to Loaded event to fix possible null exception of ProgressBar
2 parents 1bdc116 + a2f2242 commit 12c4b4d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

Flow.Launcher/MainWindow.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@
342342
Margin="12 0 12 0"
343343
HorizontalAlignment="Center"
344344
VerticalAlignment="Bottom"
345+
Loaded="ProgressBar_Loaded"
345346
StrokeThickness="2"
346347
Visibility="{Binding ProgressBarVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
347348
X1="-100"

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,6 @@ private void OnLoaded(object sender, RoutedEventArgs e)
199199
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
200200
}
201201

202-
// Initialize position
203-
InitProgressbarAnimation();
204-
205202
// Force update position
206203
UpdatePosition();
207204

@@ -354,6 +351,11 @@ private void OnLoaded(object sender, RoutedEventArgs e)
354351
}
355352
}
356353

354+
private void ProgressBar_Loaded(object sender, RoutedEventArgs e)
355+
{
356+
InitProgressbarAnimation();
357+
}
358+
357359
private async void OnClosing(object sender, CancelEventArgs e)
358360
{
359361
if (!CanClose)

0 commit comments

Comments
 (0)