Merge 80b6754 into e80d782

LeonarddeR · web-flow · commit 2a0c5cc8a17d · 2024-12-21T09:27:02.000+01:00
diff --git a/source/brailleTables.py b/source/brailleTables.py
@@ -855,6 +855,8 @@ def _loadTablesFromManifestSection(source: str, directory: str, tablesDict: dict
 
 
 def initialize():
+	if config.isAppX or globalVars.appArgs.disableAddons:
+		return
 	# The builtin tables were added at import time to the parent map.
 	# Now, add the custom tables to the first map.
 	import addonHandler
@@ -890,7 +892,7 @@ def initialize():
 						return
 					if (res := manifest.validate(Validator(), preserve_errors=True)) is not True:
 						raise ValueError(f"Errors in scratchpad manifest: {flatten_errors(manifest, res)}")
-					log.debug(f"Found {len(tablesDict)} braille table entries in manifest for scratchpad")
+					log.debug(f"Found {len(section)} braille table entries in manifest for scratchpad")
 					_loadTablesFromManifestSection(TableSource.SCRATCHPAD, directory, section)
 			except Exception:
 				log.exception(
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -81,6 +81,7 @@ Specifically, MathML inside of span and other elements that have the attribute `
 In any document, if the cursor is on the last line, it will be moved to the end when using this command.
 (#17251, #17430, @nvdaes)
 * In web browsers, changes to text selection no longer sometimes fail to be reported in editable text controls. (#17501, @jcsteh)
+* Custom braille tables in the developer scratchpad are now properly ignored when running with add-ons disabled. (#17565, @LeonarddeR)
 
 ### Changes for Developers
 
