TETRAEDGE: Do not call quitGame() when receiving a QUIT or RTL event #4827
Conversation
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
Syberia has its own confirmation dialog. Syberia 2 does not seem to ask for confirmation, but using the GUI confirmation does not work anyway as if the user decides not to quit after all, we end up with a black screen.
The only thing that quitGame() does is to send a new QUIT event, but we already have one. So this is unnecessary. Furthermore this causes an infinite loop in the case of a RTL event if the option to return to the launcher on quit is on. Indeed DefaultEventManager::pushEvent() has a check in the case of a QUIT_EVENT to ignore it if it already received one, which avoids the infinite loop, unless the QUIT_EVENT are converted to RTL events. This fixes bug #14328 and #14329.
|
Thanks for fixing! |
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.
The only thing that quitGame() does is to send a new QUIT event, but we already have one. So this is unnecessary. Furthermore this causes an infinite loop in the case of a RTL event if the option to return to the launcher on quit is on. Indeed DefaultEventManager::pushEvent() has a check in the case of a EVENT_QUIT to ignore it if it already received one, which avoids the infinite loop, unless the EVENT_QUIT are converted to RTL events.
This fixes bug #14328 and #14329.
I checked that the games still quits properly with all known way to quit a game:
Quit ScummVMmenu item in the ScummVM menu (on macOS).This pull request also includes a separate commit to not show the ScummVM quit confirmation dialog if
Ask for confirmation on exitis on in the ScummVM options. Indeed that option does not work with at least Syberia and Syberia 2 (and furthermore Syberia has its own confirmation dialog).