Qt: Fix possible crash on shutdown

pull/3498/head
Stenzek 3 months ago
parent e5593c973f
commit ce53e29997
No known key found for this signature in database

@ -1927,6 +1927,13 @@ void EmuThread::stopInThread()
m_shutdown_flag = true;
m_event_loop->quit();
// Ensure settings are saved.
if (s_settings_save_timer)
{
s_settings_save_timer.reset();
QtHost::SaveSettings();
}
}
void EmuThread::run()
@ -3401,13 +3408,6 @@ shutdown_and_exit:
delete g_main_window;
Assert(!g_main_window);
// Ensure settings are saved.
if (s_settings_save_timer)
{
s_settings_save_timer.reset();
QtHost::SaveSettings();
}
// Ensure log is flushed.
Log::SetFileOutputParams(false, nullptr);

Loading…
Cancel
Save