diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-05-25 10:09:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 10:09:44 +0200 |
| commit | 89ec040b1a44cf37da213080d11ed588e995680e (patch) | |
| tree | 2b03d8739e2bcb583c712ed110342948176baa1f /Source/Core | |
| parent | 0aba87bbde8b7b29e7f65fc9c9a66c1ce2d1c640 (diff) | |
| parent | fc928ddfc8c306238deca476794d7f4ab8b1f375 (diff) | |
Merge pull request #6962 from spycrab/qt_renderwidget_fixes
Qt: Fix stop emulation confirmation prompt bugs
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinQt2/MainWindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 66129e1fb6..524ec9114b 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -601,13 +601,13 @@ bool MainWindow::RequestStop() const Core::State state = Core::GetState(); // Only pause the game, if NetPlay is not running - bool pause = Settings::Instance().GetNetPlayClient() != nullptr; + bool pause = !m_netplay_dialog->isVisible(); if (pause) Core::SetState(Core::State::Paused); QMessageBox::StandardButton confirm; - confirm = QMessageBox::question(m_render_widget, tr("Confirm"), + confirm = QMessageBox::question(this, tr("Confirm"), m_stop_requested ? tr("A shutdown is already in progress. Unsaved data " "may be lost if you stop the current emulation " |
