-
-
Notifications
You must be signed in to change notification settings - Fork 2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make stopping emulation not pause or crash UI #14038
Merged
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
Megamouse
reviewed
Jun 16, 2023
elad335
force-pushed
the
stop-emu
branch
2 times, most recently
from
June 16, 2023 18:36
9080f3b
to
8d92560
Compare
Megamouse
reviewed
Jun 16, 2023
rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_main_menu.cpp
Outdated
Show resolved
Hide resolved
elad335
force-pushed
the
stop-emu
branch
2 times, most recently
from
June 16, 2023 18:56
5a8cb96
to
732b9f0
Compare
Megamouse
reviewed
Jun 16, 2023
Megamouse
reviewed
Jun 16, 2023
elad335
force-pushed
the
stop-emu
branch
2 times, most recently
from
June 16, 2023 19:48
def30bb
to
0812dfc
Compare
elad335
changed the title
Emulation: Make stopping emulation not pause or crash UI
Make stopping emulation not pause or crash UI
Jun 18, 2023
Megamouse
reviewed
Jun 25, 2023
elad335
force-pushed
the
stop-emu
branch
4 times, most recently
from
June 26, 2023 16:03
4b283c5
to
257fd41
Compare
Updated text message to be more clear. |
Megamouse
reviewed
Jun 26, 2023
Megamouse
reviewed
Jun 26, 2023
Megamouse
reviewed
Jun 26, 2023
* Make the UI and main thread available when stopping emulation. * Make BlockingCallFromMainThread always execute, preventing bugs when it unexpectedly did not. * Add error code for when starting emulation when Emu.Kill() is in progress.
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.
Like Loader: Make executable analyzation not halt UI when launching games #13630 which made loading games not freeze UI, before this pull request stopping emulation made the UI freeze and if took too long Windows may even make the window white and try to kill the application. But with this pr the UI is fully responsive when stopping emulation, this is also true for savestates which had an even longer pause. (albeit currently still suffering from regressions)
If you have been unlucky, you could have randomly encounter "Stopping emulation took too long" message after a few seconds when quitting the game and then the emulator simply crashed. Now you can choose to wait more for it to close safely or force terminate RPCS3. In case it closes safely while the dialog is open the dialog would close automatically. There is an indication of how many seconds have passed waiting in the dialog as well.