diff options
| author | bunnei <bunneidev@gmail.com> | 2015-04-30 19:46:50 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-05-01 18:35:51 -0400 |
| commit | bc41de2131728192e3fd4c8c83e8b2d6e5ba4530 (patch) | |
| tree | 03a92c76eb03070dd6748f1b1dbb13efb68d4af0 /src/citra_qt/bootmanager.cpp | |
| parent | ad4445c5298760d07039f2293466fe6e60e39006 (diff) | |
Qt: Fixed a bug in shutdown procedure, various cleanups.
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 4be410fe00..66a9e6fba2 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -48,7 +48,7 @@ void EmuThread::run() { Core::RunLoop(); was_active = running || exec_step; - if (!was_active) + if (!was_active && !stop_run) emit DebugModeEntered(); } else if (exec_step) { if (!was_active) @@ -273,10 +273,10 @@ void GRenderWindow::OnMinimalClientAreaChangeRequest(const std::pair<unsigned,un setMinimumSize(minimal_size.first, minimal_size.second); } -void GRenderWindow::OnEmulationStarted(EmuThread* emu_thread) { +void GRenderWindow::OnEmulationStarting(EmuThread* emu_thread) { this->emu_thread = emu_thread; } -void GRenderWindow::OnEmulationStopped() { +void GRenderWindow::OnEmulationStopping() { emu_thread = nullptr; } |