diff options
| author |  Yuri Kunde Schlesner | 2015-07-13 14:16:36 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-07-13 14:16:36 -0700 |
| commit | 1fc0347d27e05d989689ea6d06add33b1195065e (patch) | |
| tree | 374cc720a2b41e73864df00f84ded77c4ca51468 /src/citra_qt/bootmanager.cpp | |
| parent | Merge pull request #793 from neobrain/stencil (diff) | |
| parent | Qt: Fix disassembly widget stepping (diff) | |
| download | yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.gz yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.tar.xz yuzu-1fc0347d27e05d989689ea6d06add33b1195065e.zip | |
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 9d36364dd..fa7bce466 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -65,7 +65,7 @@ void EmuThread::run() { | |||
| 65 | was_active = false; | 65 | was_active = false; |
| 66 | } else { | 66 | } else { |
| 67 | std::unique_lock<std::mutex> lock(running_mutex); | 67 | std::unique_lock<std::mutex> lock(running_mutex); |
| 68 | running_cv.wait(lock, [this]{ return IsRunning() || stop_run; }); | 68 | running_cv.wait(lock, [this]{ return IsRunning() || exec_step || stop_run; }); |
| 69 | } | 69 | } |
| 70 | } | 70 | } |
| 71 | 71 | ||