Do not reset lab state when going to options#7226
Merged
wookieejedi merged 1 commit intoscp-fs2open:masterfrom Feb 19, 2026
Merged
Do not reset lab state when going to options#7226wookieejedi merged 1 commit intoscp-fs2open:masterfrom
wookieejedi merged 1 commit intoscp-fs2open:masterfrom
Conversation
wookieejedi
added
cleanup
wookieejedi
approved these changes
Feb 15, 2026
Member
|
Will merge this evening |
This file contains hidden or 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
2 participants
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.
Fixes #3530 by simply not calling lab reset when going to Options and back.
There's no normal game path that gets around returning to the Lab from Options or any of its child states. If someone uses scripting to do game state shenanigans and jumps around and then we return to the Lab from the mainhall or some other call the worst-case scenario is the Lab resumes that previous state again, so this should be pretty safe.