Skip to content

Commit 3768940

Browse files
committed
Qt: Fix assertion on shutdown after resize
1 parent 690f843 commit 3768940

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/duckstation-qt/qthost.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1926,6 +1926,13 @@ void EmuThread::stop()
19261926

19271927
QMetaObject::invokeMethod(g_emu_thread, &EmuThread::stopInThread, Qt::QueuedConnection);
19281928
QtUtils::ProcessEventsWithSleep(QEventLoop::ExcludeUserInputEvents, []() { return (g_emu_thread->isRunning()); });
1929+
1930+
// Ensure settings are saved.
1931+
if (s_settings_save_timer)
1932+
{
1933+
s_settings_save_timer.reset();
1934+
QtHost::SaveSettings();
1935+
}
19291936
}
19301937

19311938
void EmuThread::stopInThread()
@@ -1934,13 +1941,6 @@ void EmuThread::stopInThread()
19341941

19351942
m_shutdown_flag = true;
19361943
m_event_loop->quit();
1937-
1938-
// Ensure settings are saved.
1939-
if (s_settings_save_timer)
1940-
{
1941-
s_settings_save_timer.reset();
1942-
QtHost::SaveSettings();
1943-
}
19441944
}
19451945

19461946
void EmuThread::run()

0 commit comments

Comments
 (0)