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 #13039 from Dentomologist/mainwindow_fix_hidden_confirm_on_stop_dialog 

MainWindow: Prevent Confirm On Stop dialog from being hidden by the Render window
This commit is contained in:
Tilka 2024-08-31 00:08:45 +01:00 committed by GitHub
parent 8b7268ddef 9bdf862460
commit 38b189e13d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -925,7 +925,8 @@ bool MainWindow::RequestStop()
} }
const bool rendered_widget_was_active = 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) ? QWidget* confirm_parent = (!m_rendering_to_main && rendered_widget_was_active) ?
m_render_widget : m_render_widget :
static_cast<QWidget*>(this); static_cast<QWidget*>(this);