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

Qt: Ensure system is shut down before closing

Browse Source 
Fixes crash on shutdown on Mac.
This commit is contained in:
Stenzek
2023-02-05 13:43:00 +10:00
parent 1371dcfa4a
commit 0ef24398f8
9 changed files with 50 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/duckstation-nogui/nogui_host.cpp
View File

@ -981,11 +981,11 @@ std::optional<WindowInfo> Host::GetTopLevelWindowInfo()
return g_nogui_window->GetPlatformWindowInfo();
}
void Host::RequestExit(bool save_state_if_running)
void Host::RequestExit(bool allow_confirm)
{
if (System::IsValid())
{
Host::RunOnCPUThread([save_state_if_running]() { System::ShutdownSystem(save_state_if_running); });
Host::RunOnCPUThread([]() { System::ShutdownSystem(g_settings.save_state_on_exit); });
}
// clear the running flag, this'll break out of the main CPU loop once the VM is shutdown.
@ -1022,7 +1022,7 @@ static void SignalHandler(int signal)
{
std::fprintf(stderr, "Received CTRL+C, attempting graceful shutdown. Press CTRL+C again to force.\n");
graceful_shutdown_attempted = true;
Host::RequestExit(true);
Host::RequestExit(false);
return;
}