Permalink
Browse files

Merge pull request #6962 from spycrab/qt_renderwidget_fixes

Qt: Fix stop emulation confirmation prompt bugs
  • Loading branch information...
spycrab committed May 25, 2018
2 parents 0aba87b + fc928dd commit 89ec040b1a44cf37da213080d11ed588e995680e
Showing with 2 additions and 2 deletions.
  1. +2 −2 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 "

0 comments on commit 89ec040

Please sign in to comment.