Skip to content

Merge beta to master#12697

Merged
seanbudd merged 1 commit into
masterfrom
beta
Jul 29, 2021
Merged

Merge beta to master#12697
seanbudd merged 1 commit into
masterfrom
beta

Conversation

@seanbudd

Copy link
Copy Markdown
Member

Must be a merge commit, not a squash merge

Merge beta to master

Must be a merge commit, not a squash merge

Opened against beta since this PR fixes regression which should be fixed before 2021.2

Link to issue number:
Fixes #12666
Fix-up of #12544

Summary of the issue:
In some rare cases winVersion.getWinVer can cause recursion errors since it calls winVersion._getRunningVersionNameFromWinReg which in turn executes winVersion.getWinVer to check if the currently running version of Windows contains release info in the registry.

Description of how this pull request fixes the issue:
Rather than checking if the current version of Windows contains release info in the registry by comparing it to the lowest version for which this is supported I'm just checking if the necessary info exists in the registry and if not appropriate exceptions are raised.
To avoid pointless registry accesses result of getWinVer is cached - version of Windows on which NVDA is running is not going to change during its lifetime.

* Fix rare recursion error in the winVersion module

* Avoid pointless registry accesses by caching results of `getWinVer`  as the version of Windows on which we're running cannot be changed.
@seanbudd seanbudd requested a review from a team as a code owner July 29, 2021 02:35
@seanbudd seanbudd requested a review from michaelDCurran July 29, 2021 02:35
@seanbudd seanbudd linked an issue Jul 29, 2021 that may be closed by this pull request
@seanbudd seanbudd merged commit cc749cd into master Jul 29, 2021
@nvaccessAuto nvaccessAuto added this to the 2021.3 milestone Jul 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

NVDA Alpha crashes while selecting files in windows 7 explorer

4 participants