diff options
| author |  Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-13 14:16:36 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-07-13 14:16:36 -0700 |
| commit | 1fc0347d27e05d989689ea6d06add33b1195065e (patch) | |
| tree | 374cc720a2b41e73864df00f84ded77c4ca51468 /src/citra_qt/bootmanager.cpp | |
| parent | bf80ae6a1ad328814df332c1136fe14e836053c6 (diff) | |
| parent | 7ccce98389037f2bb9deac489af960bf991da0b6 (diff) | |
Merge pull request #924 from aroulin/qt-disassembly-step
Qt: Fix disassembly widget stepping
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 9d36364d..fa7bce46 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; }); } } |