diff options
| author | Liam <byteslice@airmail.cc> | 2022-12-21 19:55:01 -0500 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-12-21 19:55:01 -0500 |
| commit | 60ce34aa8080a4c8e3dd53c25376aa62d483af5b (patch) | |
| tree | e146caff183640809e7707b0b53e9614a8dc6f9a /src/yuzu/main.cpp | |
| parent | 1b11e0f0d3209603e67b26f3ef22f1d1a493bbdc (diff) | |
qt: exit properly on guest-initiated close
Diffstat (limited to 'src/yuzu/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 820f60e61b..7ec6136693 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1710,6 +1710,11 @@ 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_); }); + system->RegisterExitCallback([this] { + emu_thread->ForceStop(); + 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 @@ -4143,6 +4148,10 @@ bool GMainWindow::ConfirmForceLockedExit() { } void GMainWindow::RequestGameExit() { + if (!system->IsPoweredOn()) { + return; + } + auto& sm{system->ServiceManager()}; auto applet_oe = sm.GetService<Service::AM::AppletOE>("appletOE"); auto applet_ae = sm.GetService<Service::AM::AppletAE>("appletAE"); |