From e50188374f94b4ea4039ca628313b0e7c40de4d6 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Wed, 17 Jan 2018 18:34:58 -0500
Subject: [PATCH] bootmanager: Minor tidiness/correctness changes
Moved over from #3266 in citra.
---
src/yuzu/bootmanager.cpp | 3 +--
src/yuzu/bootmanager.h | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp
index 61d678c9b7..b9dc4943af 100644
--- a/src/yuzu/bootmanager.cpp
+++ b/src/yuzu/bootmanager.cpp
@@ -15,8 +15,7 @@
#include "input_common/motion_emu.h"
#include "yuzu/bootmanager.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/yuzu/bootmanager.h b/src/yuzu/bootmanager.h
index 6974edcbb0..130bc613b2 100644
--- a/src/yuzu/bootmanager.h
+++ b/src/yuzu/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;
}
@@ -68,12 +68,12 @@ public:
void RequestStop() {
stop_run = true;
SetRunning(false);
- };
+ }
private:
- bool exec_step;
- bool running;
- std::atomic<bool> stop_run;
+ bool exec_step = false;
+ bool running = false;
+ std::atomic<bool> stop_run{false};
std::mutex running_mutex;
std::condition_variable running_cv;
--
GitLab