Interception only filters subscribed devices

evilC · Oct 28, 2017 · 5c183c2 · 5c183c2
1 parent 8033715
commit 5c183c2
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/Core Providers/Core_Interception/Core_Interception.cs b/Core Providers/Core_Interception/Core_Interception.cs
@@ -102,20 +102,36 @@ protected virtual void Dispose(bool disposing)
             Log("Provider {0} was Disposed", ProviderName);
         }
 
+        /// <summary>
+        /// Turns on / off filtering of devices
+        /// Any filtered device will be blocked if the provider crashes
+        /// Also controls which devices are filtered when filtering is on
+        /// </summary>
+        /// <param name="state">Set to true to turn filtering on</param>
         private void SetFilterState(bool state)
         {
             if (state && !filterState)
             {
-                SetFilter(deviceContext, IsKeyboard, Filter.All);
-                SetFilter(deviceContext, IsMouse, Filter.All);
+                SetFilter(deviceContext, IsMonitoredKeyboard, Filter.All);
+                SetFilter(deviceContext, IsMonitoredMouse, Filter.All);
             }
             else if (!state && filterState)
             {
-                SetFilter(deviceContext, IsKeyboard, Filter.None);
-                SetFilter(deviceContext, IsMouse, Filter.None);
+                SetFilter(deviceContext, IsMonitoredKeyboard, Filter.None);
+                SetFilter(deviceContext, IsMonitoredMouse, Filter.None);
             }
         }
 
+        private int IsMonitoredKeyboard(int device)
+        {
+            return Convert.ToInt32(MonitoredKeyboards.ContainsKey(device));
+        }
+
+        private int IsMonitoredMouse(int device)
+        {
+            return Convert.ToInt32(MonitoredMice.ContainsKey(device));
+        }
+
         private void SetPollThreadState(bool state)
         {
             if (state && !pollThreadRunning)