Browse Source

Merge pull request #81 from lioncash/qt-bootmgr

bootmanager: Minor tidiness/correctness changes
nce_cpp
bunnei 8 years ago
committed by GitHub
parent
commit
266e2967b2
  1. 3
      src/yuzu/bootmanager.cpp
  2. 10
      src/yuzu/bootmanager.h

3
src/yuzu/bootmanager.cpp

@ -15,8 +15,7 @@
#include "input_common/motion_emu.h" #include "input_common/motion_emu.h"
#include "yuzu/bootmanager.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() { void EmuThread::run() {
render_window->MakeCurrent(); render_window->MakeCurrent();

10
src/yuzu/bootmanager.h

@ -58,7 +58,7 @@ public:
* @return True if the emulation thread is running, otherwise false * @return True if the emulation thread is running, otherwise false
* @note This function is thread-safe * @note This function is thread-safe
*/ */
bool IsRunning() {
bool IsRunning() const {
return running; return running;
} }
@ -68,12 +68,12 @@ public:
void RequestStop() { void RequestStop() {
stop_run = true; stop_run = true;
SetRunning(false); SetRunning(false);
};
}
private: 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::mutex running_mutex;
std::condition_variable running_cv; std::condition_variable running_cv;

Loading…
Cancel
Save