- Improved KeyboardHook logging

supermemo · Feb 8, 2020 · 0574ab3 · 0574ab3
1 parent 5d2293f
commit 0574ab3
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/Core/SuperMemoAssistant.Interop/Services/IO/Keyboard/KeyboardHook.cs b/src/Core/SuperMemoAssistant.Interop/Services/IO/Keyboard/KeyboardHook.cs
@@ -224,6 +224,19 @@ private IntPtr LowLevelKeyboardProc(int    nCode,
               {
                 scopeMatches = false;
               }
+
+              // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+              else if (_elWdwHandle == null || _elWdwHandle == IntPtr.Zero)
+              {
+                LogTo.Warning(
+                  $"KeyboardHook: HotKey {hk} requested with scope {Enum.GetName(typeof(HotKeyScope), hkReg.Scope)}, but _elWdwHandle is {foregroundWdwHandle}. Trying to refresh.");
+
+                OnElementWindowAvailable();
+
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+                if (_elWdwHandle == null || _elWdwHandle == IntPtr.Zero)
+                  scopeMatches = false;
+              }
 
               else if (hkReg.Scope == HotKeyScope.SMBrowser && foregroundWdwHandle != _elWdwHandle)
               {