Merge 5c68b23 into 9b5fa21

CyrilleB79 · web-flow · commit 6ca5e5b796c0 · 2022-04-26T21:46:02.000+10:00
diff --git a/source/vision/visionHandler.py b/source/vision/visionHandler.py
@@ -2,7 +2,7 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2018-2019 NV Access Limited, Babbage B.V.
+# Copyright (C) 2018-2022 NV Access Limited, Babbage B.V., Cyrille Bougot
 
 """Module containing the vision handler.
 
@@ -283,6 +283,14 @@ def initializeProvider(
 			# We should handle this more gracefully, since this is no reason
 			# to stop a provider from loading successfully.
 			log.debugWarning("Error in initial focus after provider load", exc_info=True)
+		try:
+			self.initialNavigatorObject()
+		except Exception:
+			# initialNavigatorObject might fail in case NVDA's current navigator object is an object
+			# for which property fetching raises an exception.
+			# We should handle this more gracefully, since this is no reason
+			# to stop a provider from loading successfully.
+			log.debugWarning("Error in initial navigator object after provider load", exc_info=True)
 
 	def terminate(self) -> None:
 		self.extensionPoints = None
@@ -348,3 +356,9 @@ def initialFocus(self) -> None:
 			# focus/review hasn't yet been initialized.
 			return
 		self.handleGainFocus(api.getFocusObject())
+	
+	def initialNavigatorObject(self) -> None:
+		if not api.getDesktopObject():
+			# focus/review hasn't yet been initialized.
+			return
+		self.handleReviewMove(api.getNavigatorObject())
