early-access version 3947

This commit is contained in:
pineappleEA 2023-10-25 05:30:51 +02:00
parent 1b803d3836
commit 224c0420e6
2 changed files with 16 additions and 12 deletions

View file

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 3946. This is the source code for early-access 3947.
## Legal Notice ## Legal Notice

View file

@ -3440,31 +3440,35 @@ void GMainWindow::OnStopGame() {
play_time_manager->Stop(); play_time_manager->Stop();
// Update game list to show new play time // Update game list to show new play time
game_list->PopulateAsync(UISettings::values.game_dirs); game_list->PopulateAsync(UISettings::values.game_dirs);
OnEmulationStopped(); if (OnShutdownBegin()) {
OnShutdownBeginDialog();
} else {
OnEmulationStopped();
}
} }
} }
bool GMainWindow::ConfirmShutdownGame() { bool GMainWindow::ConfirmShutdownGame() {
bool showDialog = false;
if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Always) { if (UISettings::values.confirm_before_stopping.GetValue() == ConfirmStop::Ask_Always) {
if (system->GetExitLocked()) { if (system->GetExitLocked()) {
showDialog = ConfirmForceLockedExit(); if (!ConfirmForceLockedExit()) {
return false;
}
} else { } else {
showDialog = ConfirmChangeGame(); if (!ConfirmChangeGame()) {
return false;
}
} }
} else { } else {
if (UISettings::values.confirm_before_stopping.GetValue() == if (UISettings::values.confirm_before_stopping.GetValue() ==
ConfirmStop::Ask_Based_On_Game && ConfirmStop::Ask_Based_On_Game &&
system->GetExitLocked()) { system->GetExitLocked()) {
showDialog = ConfirmForceLockedExit(); if (!ConfirmForceLockedExit()) {
return false;
}
} }
} }
return true;
if (showDialog && OnShutdownBegin()) {
OnShutdownBeginDialog();
}
return showDialog;
} }
void GMainWindow::OnLoadComplete() { void GMainWindow::OnLoadComplete() {