Fix Application.Current null exception

Jack251970 · Jack251970 · commit 15730b15aa36 · 2025-03-30T14:59:30.000+08:00
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -1464,8 +1464,8 @@ public bool ShouldIgnoreHotkeys()
 
         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 @@ public async void Hide()
                     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)

Original file line number	Diff line number	Diff line change
`@@ -1464,8 +1464,8 @@ public bool ShouldIgnoreHotkeys()`
`1464`	`1464`
`1465`	`1465`	`public void Show()`
`1466`	`1466`	`{`
`1467`		`- // Invoke on UI thread`
`1468`		`- Application.Current.Dispatcher.Invoke(() =>`
	`1467`	`+ // When application is exitting, the Application.Current will be null`
	`1468`	`+ Application.Current?.Dispatcher.Invoke(() =>`
`1469`	`1469`	`{`
`1470`	`1470`	`// When application is exitting, the Application.Current will be null`
`1471`	`1471`	`if (Application.Current?.MainWindow is MainWindow mainWindow)`
`@@ -1539,8 +1539,8 @@ public async void Hide()`
`1539`	`1539`	`break;`
`1540`	`1540`	`}`
`1541`	`1541`
`1542`		`- // Invoke on UI thread`
`1543`		`- Application.Current.Dispatcher.Invoke(() =>`
	`1542`	`+ // When application is exitting, the Application.Current will be null`
	`1543`	`+ Application.Current?.Dispatcher.Invoke(() =>`
`1544`	`1544`	`{`
`1545`	`1545`	`// When application is exitting, the Application.Current will be null`
`1546`	`1546`	`if (Application.Current?.MainWindow is MainWindow mainWindow)`