Merge pull request #7042 from spycrab/qt_conf_prompt

Qt: Exit exclusive fullscreen on confirmation prompt
This commit is contained in:
spycrab 2018-06-01 17:56:05 +02:00 committed by GitHub
commit 064d173ec4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -86,6 +86,8 @@
#include "UICommon/UICommon.h"
#include "VideoCommon/VideoConfig.h"
#if defined(HAVE_XRANDR) && HAVE_XRANDR
#include <qpa/qplatformnativeinterface.h>
#include "UICommon/X11Utils.h"
@ -625,6 +627,10 @@ bool MainWindow::RequestStop()
{
m_render_widget_geometry = m_render_widget->saveGeometry();
}
else if (g_ActiveConfig.ExclusiveFullscreenEnabled())
{
FullScreen();
}
if (SConfig::GetInstance().bConfirmStop)
{