Merge a85dab0 into bf96860

nvdaes · web-flow · commit 311ee62e77fa · 2024-04-30T06:36:19.000+02:00
diff --git a/source/addonStore/dataManager.py b/source/addonStore/dataManager.py
@@ -176,13 +176,14 @@ def _getCachedAddonData(self, cacheFilePath: str) -> Optional[CachedAddonsModel]
 		try:
 			with open(cacheFilePath, 'r', encoding='utf-8') as cacheFile:
 				cacheData = json.load(cacheFile)
-		except Exception:
+		except (KeyError, JSONDecodeError):
 			log.exception(f"Invalid add-on store cache")
 			if NVDAState.shouldWriteToDisk():
 				os.remove(cacheFilePath)
 			return None
 		try:
 			data = cacheData["data"]
+			cachedAddonData = _createStoreCollectionFromJson(data)
 			cacheHash = cacheData["cacheHash"]
 			cachedLanguage = cacheData["cachedLanguage"]
 			nvdaAPIVersion = cacheData["nvdaAPIVersion"]
@@ -192,7 +193,7 @@ def _getCachedAddonData(self, cacheFilePath: str) -> Optional[CachedAddonsModel]
 				os.remove(cacheFilePath)
 			return None
 		return CachedAddonsModel(
-			cachedAddonData=_createStoreCollectionFromJson(data),
+			cachedAddonData=cachedAddonData,
 			cacheHash=cacheHash,
 			cachedLanguage=cachedLanguage,
 			nvdaAPIVersion=tuple(nvdaAPIVersion),  # loads as list,
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -92,6 +92,7 @@ There are many minor bug fixes for applications, such as Thunderbird, Adobe Read
   -
 - Add-on Store:
   - When pressing ``ctrl+tab``, focus properly moves to the new current tab title. (#14986, @ABuffEr)
+  - If cache files are not correct, NVDA no longer will restart. (#16362, @nvdaes)
   -
 - Fixes for Chromium-based browsers when used with UIA:
   - Fixed bugs causing NVDA to hang. (#16393, #16394)

Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,7 @@ There are many minor bug fixes for applications, such as Thunderbird, Adobe Read`
`92`	`92`	`-`
`93`	`93`	`- Add-on Store:`
`94`	`94`	- When pressing ``ctrl+tab``, focus properly moves to the new current tab title. (#14986, @ABuffEr)
	`95`	`+ - If cache files are not correct, NVDA no longer will restart. (#16362, @nvdaes)`
`95`	`96`	`-`
`96`	`97`	`- Fixes for Chromium-based browsers when used with UIA:`
`97`	`98`	`- Fixed bugs causing NVDA to hang. (#16393, #16394)`