PCSX2/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2024-10-07 15:33:29 +00:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Qt: Fix not-render-to-main after start fullscreen+toggle

Browse Source
This commit is contained in:
Connor McLaughlin 2022-05-03 14:26:32 +10:00 committed by refractionpcsx2
parent 8751a2d330
commit 119b6bdfd5
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2-qt/EmuThread.cpp
View File

@ -113,7 +113,7 @@ void EmuThread::startVM(std::shared_ptr<VMBootParameters> boot_params)
// create the display, this may take a while... // create the display, this may take a while...
m_is_fullscreen = boot_params->fullscreen.value_or(QtHost::GetBaseBoolSettingValue("UI", "StartFullscreen", false)); 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)) if (!VMManager::Initialize(*boot_params))
return; return;

2
pcsx2-qt/MainWindow.cpp
View File

@ -1108,8 +1108,6 @@ void MainWindow::closeEvent(QCloseEvent* event)
DisplayWidget* MainWindow::createDisplay(bool fullscreen, bool render_to_main) 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(); HostDisplay* host_display = Host::GetHostDisplay();
if (!host_display) if (!host_display)
return nullptr; return nullptr;