diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index f6010459a..626f54a74 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -316,7 +316,8 @@ void GMainWindow::ToggleWindowMode() { // Render in the main window... render_window->BackupGeometry(); ui.horizontalLayout->addWidget(render_window); - render_window->setVisible(true); + if (emu_thread != nullptr) + render_window->setVisible(true); render_window->setFocusPolicy(Qt::ClickFocus); render_window->setFocus(); @@ -324,7 +325,8 @@ void GMainWindow::ToggleWindowMode() { // Render in a separate window... ui.horizontalLayout->removeWidget(render_window); render_window->setParent(nullptr); - render_window->setVisible(true); + if (emu_thread != nullptr) + render_window->setVisible(true); render_window->RestoreGeometry(); render_window->setFocusPolicy(Qt::NoFocus); }