Fix app not exiting

Levminer · Aug 30, 2023 · 53dc321 · 53dc321
1 parent 94d1903
commit 53dc321
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/core/App.xaml.cs b/core/App.xaml.cs
@@ -16,6 +16,7 @@ public partial class App : Application {
 		WriteIndented = true
 	};
 	internal static Settings GlobalSettings = new();
+	internal static bool exiting = false;
 
 	[DllImport("lib.dll")]
 	private static extern Settings getSettings();
@@ -56,7 +57,7 @@ protected override async void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventA
 
 		// Prevent window close
 		MainWindow.Closed += (s, e) => {
-			if (GlobalSettings.minimizeToTray) {
+			if (GlobalSettings.minimizeToTray && !exiting) {
 				MainWindow.Hide();
 				e.Handled = true;
 			} else {

diff --git a/core/Views/Tray.xaml.cs b/core/Views/Tray.xaml.cs
@@ -30,6 +30,7 @@ public void ShowHideWindowCommand_ExecuteRequested(object _, ExecuteRequestedEve
 
 	public void ExitApplicationCommand_ExecuteRequested(object _, ExecuteRequestedEventArgs args) {
 		TrayIcon.Dispose();
-		App.MainWindow?.Close();
+		App.exiting = true;
+		Application.Current.Exit();
 	}
 }