summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorTilka <tilkax@gmail.com>2024-08-31 00:08:45 +0100
committerGitHub <noreply@github.com>2024-08-31 00:08:45 +0100
commit38b189e13d775a85461c05be8a035bc623e3878c (patch)
tree0037d6db45656b409a57979c4d1d35c0d6e11335 /Source
parent8b7268ddefa135768cbd39aea5c92a7c8e85964a (diff)
parent9bdf862460d19d5809350442140d19256d8202b4 (diff)
Merge pull request #13039 from Dentomologist/mainwindow_fix_hidden_confirm_on_stop_dialog
MainWindow: Prevent Confirm On Stop dialog from being hidden by the Render window
Diffstat (limited to 'Source')
-rw-r--r--Source/Core/DolphinQt/MainWindow.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
index a02f26b7a9..5c3ca31d5a 100644
--- a/Source/Core/DolphinQt/MainWindow.cpp
+++ b/Source/Core/DolphinQt/MainWindow.cpp
@@ -925,7 +925,8 @@ bool MainWindow::RequestStop()
}
const bool rendered_widget_was_active =
- m_render_widget->isActiveWindow() && !m_render_widget->isFullScreen();
+ Settings::Instance().IsKeepWindowOnTopEnabled() ||
+ (m_render_widget->isActiveWindow() && !m_render_widget->isFullScreen());
QWidget* confirm_parent = (!m_rendering_to_main && rendered_widget_was_active) ?
m_render_widget :
static_cast<QWidget*>(this);