ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix lockup when cancelling shutdown and fullscreen

This commit is contained in:
Stenzek 2023-04-05 18:15:38 +10:00 committed by refractionpcsx2
parent daef69099b
commit 4404b06d2a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcsx2-qt/MainWindow.cpp
View File

@ -3000,8 +3000,16 @@ MainWindow::VMLock::~VMLock()
{ {
if (m_was_fullscreen) if (m_was_fullscreen)
g_emu_thread->setSurfaceless(false); g_emu_thread->setSurfaceless(false);
if (!m_was_paused) if (!m_was_paused)
g_emu_thread->setVMPaused(false); g_emu_thread->setVMPaused(false);
if (m_was_fullscreen)
{
// Wait until we get the display widget back, so we're not the last window left and closing.
while (QtHost::IsVMValid() && !g_main_window->m_display_widget)
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 1);
}
} }
void MainWindow::VMLock::cancelResume() void MainWindow::VMLock::cancelResume()