Merge 188d3a7 into fed2c63

Author: mltony

source/keyboardHandler.py

@@ -29,6 +29,7 @@
 import core
 from contextlib import contextmanager
 import threading
+import watchdog
 
 ignoreInjected=False
 
@@ -195,6 +196,10 @@ def internal_keyDownEvent(vkCode,scanCode,extended,injected):
 			currentModifiers.discard(stickyNVDAModifier)
 			stickyNVDAModifier = None
 
+		if watchdog.isAttemptingRecovery:
+			# When attempting recovery only process modifiers, but do not execute gesture.
+			return True
+
 		try:
 			inputCore.manager.executeGesture(gesture)
 			gestureExecuted=True
@@ -217,6 +222,7 @@ def internal_keyDownEvent(vkCode,scanCode,extended,injected):
 			and not gestureExecuted 
 			# and not if this gesture is a modifier key
 			and not isNVDAModifierKey(vkCode,extended) and not vkCode in KeyboardInputGesture.NORMAL_MODIFIER_KEYS
+			and not watchdog.isAttemptingRecovery
 		):
 			keyStates=(ctypes.c_byte*256)()
 			for k in range(256):

source/winInputHook.py

@@ -44,7 +44,7 @@ class MSLLHOOKSTRUCT(Structure):
 
 @WINFUNCTYPE(c_long,c_int,WPARAM,LPARAM)
 def keyboardHook(code,wParam,lParam):
-	if watchdog.isAttemptingRecovery or code!=HC_ACTION:
+	if code!=HC_ACTION:
 		return windll.user32.CallNextHookEx(0,code,wParam,lParam)
 	kbd=KBDLLHOOKSTRUCT.from_address(lParam)
 	if keyUpCallback and kbd.flags&LLKHF_UP: