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.h | |
parent | ad4445c5298760d07039f2293466fe6e60e39006 (diff) |
Qt: Fixed a bug in shutdown procedure, various cleanups.
Diffstat (limited to 'src/citra_qt/bootmanager.h')
-rw-r--r-- | src/citra_qt/bootmanager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index e5752218..715faf2d 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -51,9 +51,9 @@ public: bool IsRunning() { return running; } /** - * Requests for the emulation thread to stop running and shutdown emulation + * Requests for the emulation thread to stop running */ - void RequestShutdown() { + void RequestStop() { stop_run = true; running = false; }; @@ -115,8 +115,8 @@ public: public slots: void moveContext(); // overridden - void OnEmulationStarted(EmuThread* emu_thread); - void OnEmulationStopped(); + void OnEmulationStarting(EmuThread* emu_thread); + void OnEmulationStopping(); private: void OnMinimalClientAreaChangeRequest(const std::pair<unsigned,unsigned>& minimal_size) override; |