Fix recursive macro crash and empty macro lockout #2902
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2845
Resolves #2846
Took me a bit to sit down and write the fix, but it seems quite straightforward (just shuffling two lines). I added a couple explicative comments, but to summarize:
The existing macro replay protection didn't work, because the guard (an entry in the
replaying_macrovector) was cleared at the end of thereplay_macrofunction, but all that function does is queue the keypresses to be executed in a separate context, so recursion could still happen. Now, the guard is cleared only after the entire queue of macro presses has resolved.As for the lockdown, The problem is that we were marking the macro as being under replay before validating it, which left the register in an invalid unrecoverable state if the macro was invalid.