Merge pull request #6490 from spycrab/qt_fs_warn

Qt: Fix fullscreen quitting
This commit is contained in:
Anthony 2018-03-22 08:43:52 -07:00 committed by GitHub
commit 0f60e68e0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions

View File

@ -655,13 +655,12 @@ void MainWindow::HideRenderWidget(bool reinit)
setWindowTitle(QString::fromStdString(Common::scm_rev_str)); 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 // 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) // graphics backends (e.g. OpenGL to Vulkan). To avoid this the render widget is (safely)
// recreated // recreated
if (reinit) if (reinit)
{ {
m_render_widget->hide();
disconnect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop); disconnect(m_render_widget, &RenderWidget::Closed, this, &MainWindow::ForceStop);
m_render_widget->removeEventFilter(this); m_render_widget->removeEventFilter(this);