diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs index 56de70b47..ea1e92b22 100644 --- a/Flow.Launcher/ViewModel/MainViewModel.cs +++ b/Flow.Launcher/ViewModel/MainViewModel.cs @@ -1464,8 +1464,8 @@ namespace Flow.Launcher.ViewModel public void Show() { - // Invoke on UI thread - Application.Current.Dispatcher.Invoke(() => + // When application is exitting, the Application.Current will be null + Application.Current?.Dispatcher.Invoke(() => { // When application is exitting, the Application.Current will be null if (Application.Current?.MainWindow is MainWindow mainWindow) @@ -1539,8 +1539,8 @@ namespace Flow.Launcher.ViewModel break; } - // Invoke on UI thread - Application.Current.Dispatcher.Invoke(() => + // When application is exitting, the Application.Current will be null + Application.Current?.Dispatcher.Invoke(() => { // When application is exitting, the Application.Current will be null if (Application.Current?.MainWindow is MainWindow mainWindow)