summaryrefslogtreecommitdiffstats
path: root/src/yuzu/main.cpp
diff options
context:
space:
mode:
authorGus Caplan <me@gus.host>2022-07-18 09:41:29 +0200
committerLiam <byteslice@airmail.cc>2022-12-13 03:18:32 +0100
commitf44c60321ec767b6e881160d4960345d678edf78 (patch)
tree2b916f8af6d326845feff5c8de8515a383e8ca68 /src/yuzu/main.cpp
parentMerge pull request #9398 from liamwhite/fail (diff)
downloadyuzu-f44c60321ec767b6e881160d4960345d678edf78.tar
yuzu-f44c60321ec767b6e881160d4960345d678edf78.tar.gz
yuzu-f44c60321ec767b6e881160d4960345d678edf78.tar.bz2
yuzu-f44c60321ec767b6e881160d4960345d678edf78.tar.lz
yuzu-f44c60321ec767b6e881160d4960345d678edf78.tar.xz
yuzu-f44c60321ec767b6e881160d4960345d678edf78.tar.zst
yuzu-f44c60321ec767b6e881160d4960345d678edf78.zip
Diffstat (limited to 'src/yuzu/main.cpp')
-rw-r--r--src/yuzu/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index b11b26f7b..b38957d9a 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1707,9 +1707,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
@@ -1793,6 +1790,8 @@ void GMainWindow::ShutdownGame() {
system->SetShuttingDown(true);
system->DetachDebugger();
discord_rpc->Pause();
+
+ RequestGameExit();
emu_thread->RequestStop();
emit EmulationStopping();