程序关闭时释放钩子

Author: JiuLing-zhang

src/WindowMain.xaml.cs

@@ -9,7 +9,7 @@ public partial class WindowMain : Window
 {
     private readonly KeyboardHook _keyboardHook;
     private readonly AppSettings _appSettings;
-    private readonly UserActivityMonitor _activityMonitor;
+    private readonly UserActivityMonitor? _activityMonitor;
     private readonly ILocker _locker;
 
     private NotifyIcon _notifyIcon;
@@ -22,12 +22,12 @@ public WindowMain(KeyboardHook keyboardHook, AppSettings appSettings, ILocker lo
         _keyboardHook = keyboardHook;
         _appSettings = appSettings;
         _locker = locker;
-        _activityMonitor = activityMonitor;
 
         InitializeNotifyIcon();
 
         if (_appSettings.AutoLockSecond != 0)
         {
+            _activityMonitor = activityMonitor;
             _activityMonitor.SetAutoLockSecond(_appSettings.AutoLockSecond);
             _activityMonitor.OnIdle += (_, __) =>
             {
@@ -129,6 +129,7 @@ private void Window_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
     public void Dispose()
     {
         _notifyIcon.Visible = false;
+        _activityMonitor?.StopMonitoring();
         _keyboardHook.Dispose();
     }
 }