diff options
author | bunnei <bunneidev@gmail.com> | 2021-10-02 01:06:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-02 01:06:48 -0700 |
commit | ae3e51c795ea72dd1eaea64d44b94afab7d74007 (patch) | |
tree | 89860f4f5df991336bab7332a77e76bb58e1047f /src/yuzu/bootmanager.cpp | |
parent | 3a33519598063175fb7c16c67e32784ed97d5017 (diff) | |
parent | 2f5808b7ffd168e1ab3ac7e453f8936098350e58 (diff) |
Merge pull request #7093 from Morph1984/exit
core: Properly shutdown and exit the running application when ISelfController::Exit is called
Diffstat (limited to 'src/yuzu/bootmanager.cpp')
-rw-r--r-- | src/yuzu/bootmanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index 1519a46ed..8b9e186b0 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp @@ -302,12 +302,17 @@ GRenderWindow::GRenderWindow(GMainWindow* parent, EmuThread* emu_thread_, connect(this, &GRenderWindow::FirstFrameDisplayed, parent, &GMainWindow::OnLoadComplete); connect(this, &GRenderWindow::ExecuteProgramSignal, parent, &GMainWindow::OnExecuteProgram, Qt::QueuedConnection); + connect(this, &GRenderWindow::ExitSignal, parent, &GMainWindow::OnExit, Qt::QueuedConnection); } void GRenderWindow::ExecuteProgram(std::size_t program_index) { emit ExecuteProgramSignal(program_index); } +void GRenderWindow::Exit() { + emit ExitSignal(); +} + GRenderWindow::~GRenderWindow() { input_subsystem->Shutdown(); } |