summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-05-18 18:49:51 -0400
committerbunnei <bunneidev@gmail.com>2015-05-18 18:49:51 -0400
commit1c3cda5d7e94afd0a74525beb1e0798aa8b79dec (patch)
tree8b1d7d4d2b7b2c242bad6eb277f8b1e01491ebe0 /src/citra_qt/bootmanager.cpp
parent859707642eb275b1eeccf07c5e73924feced6579 (diff)
parenta406207cd81c9fc3218f29394e11e7711817c458 (diff)
Merge pull request #783 from jroweboy/cond-wait
Use condition var to properly pause the CPU thread
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
-rw-r--r--src/citra_qt/bootmanager.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index d3df289f8..ab9403007 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -59,6 +59,9 @@ void EmuThread::run() {
yieldCurrentThread();
was_active = false;
+ } else {
+ std::unique_lock<std::mutex> lock(running_mutex);
+ running_cv.wait(lock, [this]{ return IsRunning() || stop_run; });
}
}