Re-create tray icon on taskbar restart #3396

Author: seerge

app/NativeMethods.cs

@@ -26,6 +26,12 @@ public static TimeSpan GetIdleTime()
     private const int SC_MONITORPOWER = 0xF170;
     private const int MONITOR_OFF = 2;
 
+    [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+    public static extern int RegisterWindowMessage(string lpString);
+
+    public static readonly int WM_TASKBARCREATED = RegisterWindowMessage("TaskbarCreated");
+
+
     [DllImport("user32.dll", CharSet = CharSet.Auto, SetLastError = true)]
     private static extern IntPtr SendMessage(nint hWnd, int hMsg, int wParam, int lParam);
 

app/Program.cs

@@ -103,6 +103,8 @@ public static void Main(string[] args)
                 Visible = true
             };
 
+            Logger.WriteLine($"Tray Icon: {trayIcon.Visible}");
+
             settingsForm.SetContextMenu();
             trayIcon.MouseClick += TrayIcon_MouseClick;
             trayIcon.MouseMove += TrayIcon_MouseMove;
@@ -357,7 +359,12 @@ static void TrayIcon_MouseMove(object? sender, MouseEventArgs e)
 
         static void OnExit(object sender, EventArgs e)
         {
-            trayIcon.Visible = false;
+            if (trayIcon is not null)
+            {
+                trayIcon.Visible = false;
+                trayIcon.Dispose();
+            }
+
             PeripheralsProvider.UnregisterForDeviceEvents();
             clamshellControl.UnregisterDisplayEvents();
             NativeMethods.UnregisterPowerSettingNotification(unRegPowerNotify);

app/Settings.cs

@@ -723,6 +723,12 @@ protected override void WndProc(ref Message m)
                 m.Result = (IntPtr)1;
             }
 
+            if (m.Msg == NativeMethods.WM_TASKBARCREATED)
+            {
+                Logger.WriteLine("Taskbar created, re-creating tray icon");
+                Program.trayIcon.Visible = true;
+            }
+
             try
             {
                 base.WndProc(ref m);