From eefa6db57c6ae6ebee0db3cf3ca9be8469df074e Mon Sep 17 00:00:00 2001 From: spycrab Date: Fri, 27 Apr 2018 15:04:26 +0200 Subject: [PATCH] Qt: Fix "Render To Main" not booting into fullscreen --- Source/Core/DolphinQt2/MainWindow.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 88b785177a..78f76bedd7 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -670,10 +670,17 @@ void MainWindow::StartGame(std::unique_ptr&& parameters) void MainWindow::ShowRenderWidget() { + if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen()) + { + m_render_widget->showFullScreen(); + return; + } + if (SConfig::GetInstance().bRenderToMain) { // If we're rendering to main, add it to the stack and update our title when necessary. m_rendering_to_main = true; + m_stack->setCurrentIndex(m_stack->addWidget(m_render_widget)); connect(Host::GetInstance(), &Host::RequestTitle, this, &MainWindow::setWindowTitle); m_stack->repaint(); @@ -682,15 +689,9 @@ void MainWindow::ShowRenderWidget() { // Otherwise, just show it. m_rendering_to_main = false; - if (SConfig::GetInstance().bFullscreen && !m_render_widget->isFullScreen()) - { - m_render_widget->showFullScreen(); - } - else - { - m_render_widget->showNormal(); - m_render_widget->resize(640, 480); - } + + m_render_widget->showNormal(); + m_render_widget->resize(640, 480); } }