Merge pull request #6490 from spycrab/qt_fs_warn

Qt: Fix fullscreen quitting
dolphin-emu · Mar 22, 2018 · 0f60e68 · 0f60e68
2 parents 59c5bc9 + cc3d5a9
commit 0f60e68
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -655,13 +655,12 @@ void MainWindow::HideRenderWidget(bool reinit)
     setWindowTitle(QString::fromStdString(Common::scm_rev_str));
   }
 
-  m_render_widget->hide();
-
   // The following code works around a driver bug that would lead to Dolphin crashing when changing
   // graphics backends (e.g. OpenGL to Vulkan). To avoid this the render widget is (safely)
   // recreated
   if (reinit)
   {
+    m_render_widget->hide();
     disconnect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
 
     m_render_widget->removeEventFilter(this);