Merge a43ecda into 5b70588

CyrilleB79 · web-flow · commit 8fe411e4363c · 2024-02-01T14:58:59.000Z
diff --git a/source/watchdog.py b/source/watchdog.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2008-2021 NV Access Limited
+# Copyright (C) 2008-2024 NV Access Limited, Cyrille Bougot
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -25,6 +25,7 @@
 import exceptions
 import NVDAHelper
 import NVDAState
+from NVDAObjects.window import Window
 
 
 def __getattr__(attrName: str) -> Any:
@@ -205,12 +206,13 @@ def _shouldRecoverAfterMinTimeout():
 		return True 
 	if winUser.getClassName(info.hwndFocus) in safeWindowClassSet:
 		return False
-	if not winUser.isDescendantWindow(info.hwndActive, api.getFocusObject().windowHandle):
+	focus = api.getFocusObject()
+	if (not isinstance(focus, Window)) or (not winUser.isDescendantWindow(info.hwndActive, focus.windowHandle)):
 		# The foreground window has changed.
 		return True
 	newHwnd=info.hwndFocus
 	newThreadID=winUser.getWindowThreadProcessID(newHwnd)[1]
-	return newThreadID!=api.getFocusObject().windowThreadID
+	return newThreadID != focus.windowThreadID
 
 def _recoverAttempt():
 	try:
