N-archive/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-22 06:42:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9500 from liamwhite/reentrant-shutdown

Browse source 
qt: prevent reentrant shutdown
This commit is contained in:
liamwhite 2022-12-25 12:51:25 -05:00 committed by GitHub
commit 9933121256
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/yuzu/main.cpp
View file

@ -1785,9 +1785,9 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
OnStartGame();
}
void GMainWindow::OnShutdownBegin() {
bool GMainWindow::OnShutdownBegin() {
if (!emulation_running) {
return;
return false;
}
if (ui->action_Fullscreen->isChecked()) {
@ -1799,6 +1799,10 @@ void GMainWindow::OnShutdownBegin() {
// Disable unlimited frame rate
Settings::values.use_speed_limit.SetValue(true);
if (system->IsShuttingDown()) {
return false;
}
system->SetShuttingDown(true);
discord_rpc->Pause();
@ -1817,6 +1821,8 @@ void GMainWindow::OnShutdownBegin() {
ui->action_Pause->setEnabled(false);
ui->action_Restart->setEnabled(false);
ui->action_Stop->setEnabled(false);
return true;
}
void GMainWindow::OnShutdownBeginDialog() {
@ -3003,8 +3009,9 @@ void GMainWindow::OnStopGame() {
return;
}
OnShutdownBegin();
OnShutdownBeginDialog();
if (OnShutdownBegin()) {
OnShutdownBeginDialog();
}
}
void GMainWindow::OnLoadComplete() {

2
src/yuzu/main.h
View file

@ -336,7 +336,7 @@ private slots:
void OnReinitializeKeys(ReinitializeKeyBehavior behavior);
void OnLanguageChanged(const QString& locale);
void OnMouseActivity();
void OnShutdownBegin();
bool OnShutdownBegin();
void OnShutdownBeginDialog();
void OnEmulationStopped();
void OnEmulationStopTimeExpired();