eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 4 Projects Releases 2 Packages Wiki Activity Actions 6

Merge pull request #8605 from devsnek/graceful-shutdown

Browse source 
let games gracefully exit
This commit is contained in:
liamwhite 2022-12-16 11:57:33 -05:00 • committed by GitHub
commit 6bc1a477bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/yuzu/main.cpp
View file

@ -1710,9 +1710,6 @@ void GMainWindow::BootGame(const QString& filename, u64 program_id, std::size_t
system->RegisterExecuteProgramCallback(
[this](std::size_t program_index_) { render_window->ExecuteProgram(program_index_); });
// Register an Exit callback such that Core can exit the currently running application.
system->RegisterExitCallback([this]() { render_window->Exit(); });
connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
connect(render_window, &GRenderWindow::MouseActivity, this, &GMainWindow::OnMouseActivity);
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
@ -1799,12 +1796,16 @@ void GMainWindow::ShutdownGame() {
system->SetShuttingDown(true);
system->DetachDebugger();
discord_rpc->Pause();
emu_thread->RequestStop();
RequestGameExit();
emit EmulationStopping();
// Wait for emulation thread to complete and delete it
emu_thread->wait();
if (!emu_thread->wait(5000)) {
emu_thread->ForceStop();
emu_thread->wait();
}
emu_thread = nullptr;
emulation_running = false;