Merge ee1a19f into 14dfcac

Author: awaescher

StageManager/MainWindow.xaml

@@ -117,7 +117,9 @@
             IconSource="StageManager.ico"
             MenuActivation="LeftOrRightClick">
             <tb:TaskbarIcon.ContextMenu>
-                <ContextMenu>
+                <ContextMenu
+                    Opened="ContextMenu_Opened"
+                    Closed="ContextMenu_Closed">
                     <MenuItem
                         Header="Start with Windows"
                         IsCheckable="True"

StageManager/MainWindow.xaml.cs

@@ -57,21 +57,12 @@ protected override void OnInitialized(EventArgs e)
 			_thisHandle = new System.Windows.Interop.WindowInteropHelper(this).Handle;
 			_lastWidth = Width;
 
-			_hook = new TaskPoolGlobalHook();
-
-			_hook.MousePressed += OnMousePressed;
-			_hook.MouseReleased += OnMouseReleased;
-			_hook.MouseMoved += _hook_MouseMoved;
-
-			Task.Run(_hook.Run);
+			StartHook();
 		}
 
 		protected override void OnClosed(EventArgs e)
 		{
-			_hook.MousePressed -= OnMousePressed;
-			_hook.MouseReleased -= OnMouseReleased;
-			_hook.MouseMoved -= _hook_MouseMoved;
-			_hook.Dispose();
+			StopHook();
 
 			trayIcon.Dispose();
 
@@ -318,6 +309,32 @@ private void ApplyWindowMode()
 			BeginAnimation(LeftProperty, animation);
 		}
 
+		private void StartHook()
+		{
+			_hook = new TaskPoolGlobalHook();
+
+			_hook.MousePressed += OnMousePressed;
+			_hook.MouseReleased += OnMouseReleased;
+			_hook.MouseMoved += _hook_MouseMoved;
+
+			Task.Run(_hook.Run);
+		}
+
+		private void StopHook()
+		{
+			_hook.MousePressed -= OnMousePressed;
+			_hook.MouseReleased -= OnMouseReleased;
+			_hook.MouseMoved -= _hook_MouseMoved;
+
+			try
+			{
+				_hook.Dispose();
+			}
+			catch (HookException)
+			{
+			}
+		}
+
 		private void _hook_MouseMoved(object? sender, MouseHookEventArgs e)
 		{
 			_mouse.X = e.Data.X;
@@ -378,6 +395,16 @@ private void MenuItem_Quit_Click(object sender, RoutedEventArgs e)
 		{
 			Close();
 		}
+
+		private void ContextMenu_Closed(object sender, RoutedEventArgs e)
+		{
+			StartHook();
+		}
+
+		private void ContextMenu_Opened(object sender, RoutedEventArgs e)
+		{
+			StopHook();
+		}
 	}
 
 	public enum WindowMode