From c06f7978ac2a2f8a45fa9e856ef7e2028383ef1b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 10 Dec 2017 20:11:11 -0500 Subject: [PATCH 1/2] bootmanager: In-class initialize EmuThread's boolean member variables Trims down the initializer list a little. --- src/citra_qt/bootmanager.cpp | 3 +-- src/citra_qt/bootmanager.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 11f9d174c..a5ab0958b 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -20,8 +20,7 @@ #include "input_common/motion_emu.h" #include "network/network.h" -EmuThread::EmuThread(GRenderWindow* render_window) - : exec_step(false), running(false), stop_run(false), render_window(render_window) {} +EmuThread::EmuThread(GRenderWindow* render_window) : render_window(render_window) {} void EmuThread::run() { render_window->MakeCurrent(); diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index 6974edcbb..d1574c278 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -71,9 +71,9 @@ public: }; private: - bool exec_step; - bool running; - std::atomic stop_run; + bool exec_step = false; + bool running = false; + std::atomic stop_run{false}; std::mutex running_mutex; std::condition_variable running_cv; From e43972527111b4e97916211ecc9136d48ddcba3a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 10 Dec 2017 20:12:47 -0500 Subject: [PATCH 2/2] bootmanager: Make EmuThread's IsRunning() member function const --- src/citra_qt/bootmanager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index d1574c278..39c280dbd 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h @@ -58,7 +58,7 @@ public: * @return True if the emulation thread is running, otherwise false * @note This function is thread-safe */ - bool IsRunning() { + bool IsRunning() const { return running; }