diff --git a/Control/UserControls/Config/MotionControl.xaml b/Control/UserControls/Config/MotionControl.xaml index 45bd7e4..1506704 100644 --- a/Control/UserControls/Config/MotionControl.xaml +++ b/Control/UserControls/Config/MotionControl.xaml @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -71,7 +71,7 @@ - + diff --git a/Control/UserControls/Config/MotionControl.xaml.cs b/Control/UserControls/Config/MotionControl.xaml.cs index 14d3761..40acd7c 100644 --- a/Control/UserControls/Config/MotionControl.xaml.cs +++ b/Control/UserControls/Config/MotionControl.xaml.cs @@ -253,13 +253,10 @@ namespace GeekDesk.Control.UserControls.Config { if (appConfig.MarginHide) { - MainWindow.hide.TimerSet(); + MarginHide.StartHide(); } else { - if (MainWindow.hide.timer != null) - { - MainWindow.hide.TimerStop(); - } + MarginHide.StopHide(); } } diff --git a/Thread/MouseHookThread.cs b/Thread/MouseHookThread.cs index 56eb57e..59d522b 100644 --- a/Thread/MouseHookThread.cs +++ b/Thread/MouseHookThread.cs @@ -24,6 +24,7 @@ namespace GeekDesk.Thread public static void MiddleHook() { //使用dispatcher来单独监听UI线程 防止程序卡顿 + if (dispatcher != null) return; dispatcher = DispatcherBuild.Build(); m_GlobalHook = Hook.GlobalEvents(); dispatcher.Invoke((Action)(() => @@ -38,6 +39,7 @@ namespace GeekDesk.Thread { m_GlobalHook.MouseDownExt -= M_GlobalHook_MouseDownExt; m_GlobalHook.Dispose(); + m_GlobalHook = null; dispatcher.InvokeShutdown(); dispatcher = null; } @@ -60,7 +62,7 @@ namespace GeekDesk.Thread { if (MainWindow.mainWindow.Visibility == Visibility.Collapsed || MainWindow.mainWindow.Opacity == 0 - || MarginHide.isHide) + || MarginHide.IS_HIDE) { MainWindow.ShowApp(); }