Fixed a bug where NVDA sometimes was unable to reset the configuration to factory defaults when using the NVDA+control+r command (#16919)

fixes #16896

Summary of the issue:
Sometimes, when pressing the NVDA+control+r command three times, NVDA wouldn't reset the configuration to factory defaults, but instead produce the following error
ERROR - keyboardHandler.internal_keyDownEvent (10:14:40.187) - winInputHook (13232):
internal_keyDownEvent
Traceback (most recent call last):
File "keyboardHandler.pyc", line 245, in internal_keyDownEvent
File "inputCore.pyc", line 535, in executeGesture
AttributeError: 'NoneType' object has no attribute 'suppressClearBrailleRegions'

Description of user facing changes
The user will reliably be able to reset the configuration to factory defaults with the NVDA+control+r command

Description of development approach
the suppressCancelSpeech function is only defined and called if braille.handler is not None, otherwise, speech.cancelSpeech is called

Author: Emil-18

source/inputCore.py

@@ -531,16 +531,23 @@ def executeGesture(self, gesture):
 		if speechEffect == gesture.SPEECHEFFECT_CANCEL:
 			# Import late to avoid circular import.
 			import braille
+			if braille.handler:
+				@braille.handler.suppressClearBrailleRegions(script)
+				def suppressCancelSpeech():
+					speech.cancelSpeech()
+
+				queueHandler.queueFunction(
+					queueHandler.eventQueue,
+					suppressCancelSpeech,
+					_immediate=immediate,
+				)
+			else:
+				queueHandler.queueFunction(
+					queueHandler.eventQueue,
+					speech.cancelSpeech,
+					_immediate=immediate,
+				)
 
-			@braille.handler.suppressClearBrailleRegions(script)
-			def suppressCancelSpeech():
-				speech.cancelSpeech()
-
-			queueHandler.queueFunction(
-				queueHandler.eventQueue,
-				suppressCancelSpeech,
-				_immediate=immediate,
-			)
 		elif speechEffect in (gesture.SPEECHEFFECT_PAUSE, gesture.SPEECHEFFECT_RESUME):
 			queueHandler.queueFunction(queueHandler.eventQueue, speech.pauseSpeech, speechEffect == gesture.SPEECHEFFECT_PAUSE)
 

user_docs/en/changes.md

@@ -74,6 +74,7 @@ A warning message will inform you if you try writing to a non-empty directory. (
   * No longer cause Google Chrome to crash when closing a document or exiting Chrome. (#16893)
 * NVDA will announce correctly the autocomplete suggestions in Eclipse and other Eclipse-based environments on Windows 11. (#16416, @thgcode)
 * Improved reliability of automatic text readout, particularly in terminal applications. (#15850, #16027, @Danstiv)
+* It is once again possible to reset the configuration to factory defaults reliably. (#16755, @Emil-18)
 * NVDA will correctly announce selection changes when editing a cell's text in Microsoft Excel. (#15843)
 * In applications using Java Access Bridge, NVDA will now correctly read the last blank line of a text instead of repeating the previous line. (#9376, @dmitrii-drobotov)
 * In LibreOffice Writer (version 24.8 and newer), when toggling text formatting (bold, italic, underline, subscript/superscript, alignment) using the corresponding keyboard shortcut, NVDA announces the new formatting attribute (e.g. "Bold on", "Bold off"). (#4248, @michaelweghorn)