Merge pull request #7042 from spycrab/qt_conf_prompt

Qt: Exit exclusive fullscreen on confirmation prompt
dolphin-emu · Jun 1, 2018 · 064d173 · 064d173
2 parents 816c80c + 3b59ebb
commit 064d173
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -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)
   {