sgilissen/llamaplayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Qt: Fix window close in nogui mode

Browse Source
This commit is contained in:
Connor McLaughlin
2022-08-29 20:31:29 +10:00
parent 28363af3ff
commit 837495d90f
5 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/duckstation-qt/qthost.cpp
View File

@@ -1373,7 +1373,9 @@ void EmuThread::stop()
void EmuThread::stopInThread()
{
m_shutdown_flag.store(true);
stopFullscreenUI();
m_shutdown_flag = true;
m_event_loop->quit();
}
@@ -1390,7 +1392,7 @@ void EmuThread::run()
startBackgroundControllerPollTimer();
// main loop
while (!m_shutdown_flag.load())
while (!m_shutdown_flag)
{
if (System::IsRunning())
{
@@ -1398,9 +1400,6 @@ void EmuThread::run()
}
else
{
m_event_loop->processEvents(QEventLoop::AllEvents);
CommonHost::PumpMessagesOnCPUThread();
// we want to keep rendering the UI when paused and fullscreen UI is enabled
if (!FullscreenUI::HasActiveWindow() && !System::IsRunning())
{
@@ -1409,7 +1408,10 @@ void EmuThread::run()
continue;
}
renderDisplay(false);
m_event_loop->processEvents(QEventLoop::AllEvents);
CommonHost::PumpMessagesOnCPUThread();
if (g_host_display)
renderDisplay(false);
}
}