Repository: nvaccess/nvda

Issue:
Alpha snaps recently broke Audio Themes add-on


### Steps to reproduce:
Run or install the alpha snapshot nvda_snapshot_alpha-24329,d3444424.exe

or later. The running copy will pick up the condition of add ons of course. Sound themes can be the only add on. The non working version is at 
https://www.dropbox.com/s/i5git9fn8gzjmma/audiothemes_6.0_Gen.nvda-addon?dl=1

### Actual behavior:

When this or later alpha snaps are used, there is an error noise, and although when you select continue running you can see the add on control panel, it does not work producing the error if you alter anything, just like when nvda starts or reboots after the add on is installed. Also noted is that nvda seems to be starting over the top of the closing tones, which the previous version does not. The version which works with this add on is: nvda_snapshot_alpha-25732,527e54c7.exe


### Expected behavior:

The add on should make the default sounds as it does in the earlier snap, and the control panel should also work.
### System configuration

Windows 7 pro, latest updates, 8gig ram.  add ons loaded, since bit pointless if they are not.


#### NVDA portable/

#### NVDA version:

See above, the current stable and beta/rc version  of course show no issues.

#### Windows version:
7 Pro, but should not make any difference.

#### Name and version of other software in use when reproducing the issue:
It happens as nvda is starting and remains inoperative till you chang back to the previous alpha or a stable version. Also, iit seems not to matter if its in continue running mode or portable install.

#### Other information about your system:
Its using external sound box, but its been the same for many years. It is of course 64 bit Windows, 

### Other questions
#### Does the issue still occur after restarting your computer?
Yes
#### Have you tried any other versions of NVDA? If so, please report their behaviors.
See above
#### If add-ons are disabled, is your problem still occurring?
Obviously not! However I do notice that you cannot restart with add ons disabled if in continue running mode, which is a little strange.
#### Does the issue still occur after you run the COM Registration Fixing Tool in NVDA's tools menu?
Yes
I will try to add a file with the two complete logs in a zip file


Discussion:

Resolving patch:
diff --git a/source/braille.py b/source/braille.py
--- a/source/braille.py
+++ b/source/braille.py
@@ -2778,12 +2778,12 @@ def _get_keyNames(self):
 		return self.id.split("+")
 
 	def _get_speechEffectWhenExecuted(self) -> Optional[str]:
-		from globalCommands import GlobalCommands
+		from globalCommands import commands
 		if (
 			not config.conf["braille"]["interruptSpeechWhileScrolling"]
 			and self.script in {
-				GlobalCommands.script_braille_scrollBack,
-				GlobalCommands.script_braille_scrollForward,
+				commands.script_braille_scrollBack,
+				commands.script_braille_scrollForward,
 			}
 		):
 			return None
diff --git a/source/config/featureFlagEnums.py b/source/config/featureFlagEnums.py
--- a/source/config/featureFlagEnums.py
+++ b/source/config/featureFlagEnums.py
@@ -23,7 +23,7 @@
 )
 
 
-class FeatureFlagEnumProtocol(Protocol, typing.Collection):
+class FeatureFlagEnumProtocol(Protocol):
 	""" All feature flags are expected to have a "DEFAULT" value.
 	This definition is provided only for type annotations
 	"""


Test patch:
diff --git a/tests/unit/test_controlTypes.py b/tests/unit/test_controlTypes.py
--- a/tests/unit/test_controlTypes.py
+++ b/tests/unit/test_controlTypes.py
@@ -252,7 +252,6 @@ def test_rolesValues(self):
 			)
 
 
-
 class Test_FontSize(unittest.TestCase):
 	def test_translateFromAttribute(self):
 		with self.assertLogs(logHandler.log, level=logging.DEBUG) as logContext: