From 119b6bdfd562a21db6132daaf4e7b37c08e0dfee Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Tue, 3 May 2022 14:26:32 +1000 Subject: [PATCH] Qt: Fix not-render-to-main after start fullscreen+toggle --- pcsx2-qt/EmuThread.cpp | 2 +- pcsx2-qt/MainWindow.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pcsx2-qt/EmuThread.cpp b/pcsx2-qt/EmuThread.cpp index f4cf66c45f..11626b42cf 100644 --- a/pcsx2-qt/EmuThread.cpp +++ b/pcsx2-qt/EmuThread.cpp @@ -113,7 +113,7 @@ void EmuThread::startVM(std::shared_ptr boot_params) // create the display, this may take a while... m_is_fullscreen = boot_params->fullscreen.value_or(QtHost::GetBaseBoolSettingValue("UI", "StartFullscreen", false)); - m_is_rendering_to_main = !m_is_fullscreen && QtHost::GetBaseBoolSettingValue("UI", "RenderToMainWindow", true); + m_is_rendering_to_main = QtHost::GetBaseBoolSettingValue("UI", "RenderToMainWindow", true); if (!VMManager::Initialize(*boot_params)) return; diff --git a/pcsx2-qt/MainWindow.cpp b/pcsx2-qt/MainWindow.cpp index 16ce37efe5..50ee089792 100644 --- a/pcsx2-qt/MainWindow.cpp +++ b/pcsx2-qt/MainWindow.cpp @@ -1108,8 +1108,6 @@ void MainWindow::closeEvent(QCloseEvent* event) DisplayWidget* MainWindow::createDisplay(bool fullscreen, bool render_to_main) { - pxAssertRel(!fullscreen || !render_to_main, "Not rendering to main and fullscreen"); - HostDisplay* host_display = Host::GetHostDisplay(); if (!host_display) return nullptr;