summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-13 23:16:36 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-13 23:16:36 +0200
commit1fc0347d27e05d989689ea6d06add33b1195065e (patch)
tree374cc720a2b41e73864df00f84ded77c4ca51468 /src/citra_qt
parentMerge pull request #793 from neobrain/stencil (diff)
parentQt: Fix disassembly widget stepping (diff)
downloadyuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar
yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.gz
yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.bz2
yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.lz
yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.xz
yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.zst
yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.zip
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/bootmanager.cpp2
-rw-r--r--src/citra_qt/bootmanager.h5
2 files changed, 5 insertions, 2 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index 9d36364dd..fa7bce466 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -65,7 +65,7 @@ void EmuThread::run() {
was_active = false;
} else {
std::unique_lock<std::mutex> lock(running_mutex);
- running_cv.wait(lock, [this]{ return IsRunning() || stop_run; });
+ running_cv.wait(lock, [this]{ return IsRunning() || exec_step || stop_run; });
}
}
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h
index 475124319..1a1e0e6a5 100644
--- a/src/citra_qt/bootmanager.h
+++ b/src/citra_qt/bootmanager.h
@@ -35,7 +35,10 @@ public:
* Steps the emulation thread by a single CPU instruction (if the CPU is not already running)
* @note This function is thread-safe
*/
- void ExecStep() { exec_step = true; }
+ void ExecStep() {
+ exec_step = true;
+ running_cv.notify_all();
+ }
/**
* Sets whether the emulation thread is running or not