Call ReopenTaskbars instead of complete restart.

dremin · Nov 14, 2024 · bc158a5 · bc158a5
1 parent c00a39a
commit bc158a5
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/RetroBar/Utilities/ExplorerMonitor.cs b/RetroBar/Utilities/ExplorerMonitor.cs
@@ -10,7 +10,7 @@ public class ExplorerMonitor : IDisposable
         private bool _ExplorerMonitorIsMonitoring;
         private MonitorWindow _explorerMonitor;
 
-        public void ExplorerMonitorStart()
+        public void ExplorerMonitorStart(WindowManager _windowManagerReference)
         {
             if(_ExplorerMonitorIsMonitoring) // Prevent multiple monitors.
             {
@@ -19,7 +19,7 @@ public void ExplorerMonitorStart()
             else
             {
                 _ExplorerMonitorIsMonitoring = true; // We will set flag to true to prevent multiple monitors.
-                _explorerMonitor = new MonitorWindow(); // Start monitoring.
+                _explorerMonitor = new MonitorWindow(_windowManagerReference); // Start monitoring.
             }
         }
 
@@ -31,11 +31,12 @@ public void Dispose()
         // NativeWindow implementation for monitoring
         private class MonitorWindow : NativeWindow, IDisposable
         {
-            //private readonly WindowManager _windowManager;
+            private WindowManager _windowManager;
             private static readonly int TaskbarCreatedMessage = NativeMethods.RegisterWindowMessage("TaskbarCreated");
 
-            public MonitorWindow()
+            public MonitorWindow(WindowManager _windowManagerReference)
             {
+                _windowManager = _windowManagerReference;
                 CreateHandle(new CreateParams());
             }
 
@@ -45,15 +46,11 @@ protected override void WndProc(ref Message m)
                 {
                     try
                     {
-                        //_windowManager.ReopenTaskbars(); // Reopen taskbars if explorer.exe is restarted.
-                        string appPath = Process.GetCurrentProcess().MainModule?.FileName;
-                        Process.Start(appPath); // Start a new instance of RetroBar
-                        Environment.Exit(0); // Exit the current instance of RetroBar
+                        _windowManager.ReopenTaskbars(); // Reopen taskbars if explorer.exe is restarted.
                     }
                     catch (Exception ex)
                     {
-                        //Debug.WriteLine($"Error handling TaskbarCreated message on ExplorerMonitor: {ex.Message}");
-                        Debug.WriteLine($"Error restarting RetroBar: {ex.Message}");
+                        Debug.WriteLine($"Error handling TaskbarCreated message on ExplorerMonitor: {ex.Message}");
                     }
                 }