fix(core): fix event handler leak

mika-f · Jul 10, 2019 · 1e9ddf7 · 1e9ddf7
1 parent 1ba03e0
commit 1e9ddf7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/Source/Robock/Models/Desktop.cs b/Source/Robock/Models/Desktop.cs
@@ -49,7 +49,7 @@ public Desktop(Screen screen, int index)
             {
                 Query = new EventQuery($@"SELECT * FROM RegistryValueChangeEvent WHERE Hive = 'HKEY_USERS' AND KeyPath = '{identity.User.Value}\\Control Panel\\Desktop' AND ValueName = 'Wallpaper'")
             };
-            _watcher.EventArrived += (sender, e) => GetCurrentWallpaper();
+            _watcher.EventArrived += OnEventArrived;
             _watcher.Start();
 
             GetCurrentWallpaper();
@@ -67,11 +67,17 @@ public void Dispose()
             }
             finally
             {
+                _watcher.EventArrived -= OnEventArrived;
                 _watcher.Stop();
                 _watcher.Dispose();
             }
         }
 
+        private void OnEventArrived(object sender, EventArrivedEventArgs _)
+        {
+            GetCurrentWallpaper();
+        }
+
         public async Task Handshake()
         {
             _process = Process.Start("Robock.Background.exe", $"{_uuid}");