Reduce hangs and implement Restart Manager compliance (#30)

TheJoeFin · TheJoeFin · commit ef1cfd4a83b6 · 2025-12-30T14:25:26.000-06:00
* Add Windows shutdown message handling (WM_QUERYENDSESSION/WM_ENDSESSION) * Register application for restart after Windows Updates * Implement graceful shutdown within 2 second timeout * Add SystemEvents.SessionEnding handler for logoff/shutdown * Add global exception handlers (Application.ThreadException, UnhandledException) * Wrap async void event handlers with try/catch to prevent crashes * Implement proper icon disposal with thread-safe locking * Add symbol image caching to reduce menu rendering overhead * Move process instance check off UI thread * Clear caches on theme changes to prevent memory leaks Complies with Microsoft Restart Manager guidelines: - Responds to shutdown messages correctly - Saves state within timeout period - Registers for restart (no crash/hang restart) - Handles forced shutdown gracefully Fixes #30
diff --git a/Forms/SettingsForm.cs b/Forms/SettingsForm.cs
@@ -169,24 +169,31 @@ private void DeleteMI_Click(object? sender, EventArgs e) {
     }
 
     private async void setStartupCheckBox() {
-        StartupTask startupTask = await StartupTask.GetAsync("StartCaffeinated");
-        Debug.WriteLine("Startup is " + startupTask.State.ToString());
-
-        switch (startupTask.State) {
-            case StartupTaskState.Disabled:
-                // Task is disabled but can be enabled.
-                StartupChkBox.Checked = false;
-                break;
-            case StartupTaskState.DisabledByUser:
-                // Task is disabled and user must enable it manually.
-                StartupChkBox.Checked = false;
-                StartupChkBox.Enabled = false;
-
-                StartupChkBox.Text += "\nDisabled in Task Manager";
-                break;
-            case StartupTaskState.Enabled:
-                StartupChkBox.Checked = true;
-                break;
+        try {
+            StartupTask startupTask = await StartupTask.GetAsync("StartCaffeinated");
+            Debug.WriteLine("Startup is " + startupTask.State.ToString());
+
+            switch (startupTask.State) {
+                case StartupTaskState.Disabled:
+                    // Task is disabled but can be enabled.
+                    StartupChkBox.Checked = false;
+                    break;
+                case StartupTaskState.DisabledByUser:
+                    // Task is disabled and user must enable it manually.
+                    StartupChkBox.Checked = false;
+                    StartupChkBox.Enabled = false;
+
+                    StartupChkBox.Text += "\nDisabled in Task Manager";
+                    break;
+                case StartupTaskState.Enabled:
+                    StartupChkBox.Checked = true;
+                    break;
+            }
+        }
+        catch (Exception ex) {
+            Debug.WriteLine($"Error checking startup state: {ex.Message}");
+            // Disable checkbox if we can't determine state
+            StartupChkBox.Enabled = false;
         }
     }
 
@@ -205,17 +212,28 @@ private void DefaultDurationBox_SelectedIndexChanged(object sender,EventArgs e)
     }
 
     private async void StartupChkBox_CheckedChanged(object sender, EventArgs e) {
-        StartupTask startupTask = await StartupTask.GetAsync("StartCaffeinated");
-
-        switch (StartupChkBox.Checked) {
-            case true:
-                StartupTaskState newState = await startupTask.RequestEnableAsync();
-                Debug.WriteLine("Request to enable startup, result = {0}", newState);
-                break;
-            case false:
-                startupTask.Disable();
-                Debug.WriteLine("Disabled startup task");
-                break;
+        try {
+            StartupTask startupTask = await StartupTask.GetAsync("StartCaffeinated");
+
+            switch (StartupChkBox.Checked) {
+                case true:
+                    StartupTaskState newState = await startupTask.RequestEnableAsync();
+                    Debug.WriteLine("Request to enable startup, result = {0}", newState);
+                    break;
+                case false:
+                    startupTask.Disable();
+                    Debug.WriteLine("Disabled startup task");
+                    break;
+            }
+        }
+        catch (Exception ex) {
+            Debug.WriteLine($"Error changing startup state: {ex.Message}");
+            MessageBox.Show(
+                $"Could not change startup setting: {ex.Message}",
+                "Caffeinated",
+                MessageBoxButtons.OK,
+                MessageBoxIcon.Warning
+            );
         }
     }
 
diff --git a/Helpers/NativeMethods.cs b/Helpers/NativeMethods.cs
@@ -8,4 +8,14 @@ internal static class NativeMethods {
     public const uint ES_CONTINUOUS = 0x80000000;
     public const uint ES_SYSTEM_REQUIRED = 0x00000001;
     public const uint ES_DISPLAY_REQUIRED = 0x00000002;
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+    public static extern int RegisterApplicationRestart(
+        string? pwzCommandline,
+        int dwFlags);
+
+    public const int RESTART_NO_CRASH = 1;
+    public const int RESTART_NO_HANG = 2;
+    public const int RESTART_NO_PATCH = 4;
+    public const int RESTART_NO_REBOOT = 8;
 }
diff --git a/Program.cs b/Program.cs
