From 58c67a04978dd37935a757dc68a72a0b1c75bc0a Mon Sep 17 00:00:00 2001
From: liufei <demoliu94@163.com>
Date: Thu, 6 Jan 2022 20:05:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8A=E6=94=BE=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow.xaml.cs        | 1 +
 Thread/MouseHookThread.cs | 4 +++-
 Util/MarginHide.cs        | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3414a2e..f9a3958 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -406,6 +406,7 @@ namespace GeekDesk
             {
                 MouseHookThread.Dispose();
             }
+            hide.TimerStop();
             Application.Current.Shutdown();
         }
 
diff --git a/Thread/MouseHookThread.cs b/Thread/MouseHookThread.cs
index 48d6f76..56eb57e 100644
--- a/Thread/MouseHookThread.cs
+++ b/Thread/MouseHookThread.cs
@@ -39,7 +39,9 @@ namespace GeekDesk.Thread
                 m_GlobalHook.MouseDownExt -= M_GlobalHook_MouseDownExt;
                 m_GlobalHook.Dispose();
                 dispatcher.InvokeShutdown();
-            } catch { }
+                dispatcher = null;
+            }
+            catch { }
             
         }
 
diff --git a/Util/MarginHide.cs b/Util/MarginHide.cs
index d6fe6ac..772f993 100644
--- a/Util/MarginHide.cs
+++ b/Util/MarginHide.cs
@@ -167,6 +167,7 @@ namespace GeekDesk.Util
 
         public void TimerStop()
         {
+            if (timer == null) return;
             timer.Stop();
             timer.Dispose();
             timer = null;