Merge 98fa3bf into b53692a

seanbudd · web-flow · commit b9b153a59e53 · 2022-12-30T11:24:34.000+11:00
diff --git a/source/NVDAState.py b/source/NVDAState.py
@@ -44,3 +44,27 @@ def _getExitCode() -> int:
 
 def _setExitCode(exitCode: int) -> None:
 	globalVars.exitCode = exitCode
+
+
+class _TrackNVDAInitialization:
+	"""
+	During NVDA initialization,
+	core._initializeObjectCaches needs to cache the desktop object,
+	regardless of lock state.
+	Security checks may cause the desktop object to not be set if NVDA starts on the lock screen.
+	As such, during initialization, NVDA should behave as if Windows is unlocked,
+	i.e. winAPI.sessionTracking._isLockScreenModeActive should return False.
+	"""
+
+	_isNVDAInitialized = False
+	"""When False, _isLockScreenModeActive is forced to return False.
+	"""
+
+	@staticmethod
+	def markInitializationComplete():
+		assert not _TrackNVDAInitialization._isNVDAInitialized
+		_TrackNVDAInitialization._isNVDAInitialized = True
+
+	@staticmethod
+	def isInitializationComplete() -> bool:
+		return _TrackNVDAInitialization._isNVDAInitialized
diff --git a/source/core.py b/source/core.py
@@ -453,32 +453,6 @@ def _initializeObjectCaches():
 	api.setMouseObject(desktopObject)
 
 
-class _TrackNVDAInitialization:
-	"""
-	During NVDA initialization,
-	core._initializeObjectCaches needs to cache the desktop object,
-	regardless of lock state.
-	Security checks may cause the desktop object to not be set if NVDA starts on the lock screen.
-	As such, during initialization, NVDA should behave as if Windows is unlocked,
-	i.e. winAPI.sessionTracking._isLockScreenModeActive should return False.
-
-	TODO: move to NVDAState module
-	"""
-
-	_isNVDAInitialized = False
-	"""When False, _isLockScreenModeActive is forced to return False.
-	"""
-
-	@staticmethod
-	def markInitializationComplete():
-		assert not _TrackNVDAInitialization._isNVDAInitialized
-		_TrackNVDAInitialization._isNVDAInitialized = True
-
-	@staticmethod
-	def isInitializationComplete() -> bool:
-		return _TrackNVDAInitialization._isNVDAInitialized
-
-
 def _doLoseFocus():
 	import api
 	focusObject = api.getFocusObject()
@@ -765,7 +739,7 @@ def run(self):
 	from winAPI import sessionTracking
 	sessionTracking.initialize()
 
-	_TrackNVDAInitialization.markInitializationComplete()
+	NVDAState._TrackNVDAInitialization.markInitializationComplete()
 
 	log.info("NVDA initialized")
 
diff --git a/source/winAPI/sessionTracking.py b/source/winAPI/sessionTracking.py
@@ -30,6 +30,7 @@
 
 from baseObject import AutoPropertyObject
 from logHandler import log
+from NVDAState import _TrackNVDAInitialization
 
 from .types import HWNDValT
 from ._wtsApi32 import (
@@ -177,7 +178,6 @@ def isWindowsLocked() -> bool:
 
 
 def _isWindowsLocked() -> bool:
-	from core import _TrackNVDAInitialization
 	if not _TrackNVDAInitialization.isInitializationComplete():
 		# Wait until initialization is complete,
 		# so NVDA and other consumers can register the lock state
