fix: Notification Exit context menu

christiankyle-ching · christiankyle-ching · commit 73d26e534d2f · 2022-03-18T18:20:52.000+08:00
diff --git a/DigitalWellbeingWPF/Helpers/Notifier.cs b/DigitalWellbeingWPF/Helpers/Notifier.cs
@@ -56,7 +56,7 @@ static Notifier()
             // Context Menu : Exit App
             ctx.Items.Add("Exit", null, (s, e) =>
             {
-                mWindow.Close();
+                mWindow.ForceClose();
             });
 
             // Always visible for notifications to work
diff --git a/DigitalWellbeingWPF/MainWindow.xaml.cs b/DigitalWellbeingWPF/MainWindow.xaml.cs
@@ -142,6 +142,11 @@ public void RestoreWindow()
             usagePage.OnNavigate();
         }
 
+        public void ForceClose()
+        {
+            Application.Current.Shutdown();
+        }
+
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             if (Properties.Settings.Default.MinimizeOnExit)

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static Notifier()`
`56`	`56`	`// Context Menu : Exit App`
`57`	`57`	`ctx.Items.Add("Exit", null, (s, e) =>`
`58`	`58`	`{`
`59`		`- mWindow.Close();`
	`59`	`+ mWindow.ForceClose();`
`60`	`60`	`});`
`61`	`61`
`62`	`62`	`// Always visible for notifications to work`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,11 @@ public void RestoreWindow()`
`142`	`142`	`usagePage.OnNavigate();`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ public void ForceClose()`
	`146`	`+ {`
	`147`	`+ Application.Current.Shutdown();`
	`148`	`+ }`
	`149`	`+`
`145`	`150`	`private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)`
`146`	`151`	`{`
`147`	`152`	`if (Properties.Settings.Default.MinimizeOnExit)`