ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6962 from spycrab/qt_renderwidget_fixes 

Qt: Fix stop emulation confirmation prompt bugs
This commit is contained in:
spycrab 2018-05-25 10:09:44 +02:00 committed by GitHub
parent 0aba87bbde fc928ddfc8
commit 89ec040b1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinQt2/MainWindow.cpp
View File

@ -601,13 +601,13 @@ bool MainWindow::RequestStop()
const Core::State state = Core::GetState(); const Core::State state = Core::GetState();
// Only pause the game, if NetPlay is not running // Only pause the game, if NetPlay is not running
bool pause = Settings::Instance().GetNetPlayClient() != nullptr; bool pause = !m_netplay_dialog->isVisible();
if (pause) if (pause)
Core::SetState(Core::State::Paused); Core::SetState(Core::State::Paused);
QMessageBox::StandardButton confirm; QMessageBox::StandardButton confirm;
confirm = QMessageBox::question(m_render_widget, tr("Confirm"), confirm = QMessageBox::question(this, tr("Confirm"),
m_stop_requested ? m_stop_requested ?
tr("A shutdown is already in progress. Unsaved data " tr("A shutdown is already in progress. Unsaved data "
"may be lost if you stop the current emulation " "may be lost if you stop the current emulation "