citra-emu
/
citra
Archived
1
0
Fork 0
Code

Merge pull request #3266 from lioncash/qt-bootmgr 

bootmanager: Minor tidiness/correctness changes
This commit is contained in:
Yuri Kunde Schlesner 2017-12-11 01:53:35 -05:00 committed by GitHub
parent 660accc92f e439725271
commit 422c7b29b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/citra_qt/bootmanager.cpp
View File

@ -20,8 +20,7 @@
#include "input_common/motion_emu.h" #include "input_common/motion_emu.h"
#include "network/network.h" #include "network/network.h"
EmuThread::EmuThread(GRenderWindow* render_window) EmuThread::EmuThread(GRenderWindow* render_window) : render_window(render_window) {}
: exec_step(false), running(false), stop_run(false), render_window(render_window) {}
void EmuThread::run() { void EmuThread::run() {
render_window->MakeCurrent(); render_window->MakeCurrent();

8
src/citra_qt/bootmanager.h
View File

@ -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;
} }
@ -71,9 +71,9 @@ public:
}; };
private: private:
bool exec_step; bool exec_step = false;
bool running; bool running = false;
std::atomic<bool> stop_run; std::atomic<bool> stop_run{false};
std::mutex running_mutex; std::mutex running_mutex;
std::condition_variable running_cv; std::condition_variable running_cv;