From 7931d2d00de1d93fe03372cf4fc81bc4f4c8b3a6 Mon Sep 17 00:00:00 2001 From: spycrab Date: Fri, 25 May 2018 03:53:05 +0200 Subject: [PATCH 1/2] Qt: Fix game not getting paused when exit prompt is open --- Source/Core/DolphinQt2/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 66129e1fb6..89d0b7775c 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -601,7 +601,7 @@ 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); From fc928ddfc8c306238deca476794d7f4ab8b1f375 Mon Sep 17 00:00:00 2001 From: spycrab Date: Fri, 25 May 2018 03:53:40 +0200 Subject: [PATCH 2/2] Qt: Show exit confirmation prompt on main window --- Source/Core/DolphinQt2/MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 89d0b7775c..524ec9114b 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -607,7 +607,7 @@ bool MainWindow::RequestStop() 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 "