Merge pull request #924 from aroulin/qt-disassembly-step
Qt: Fix disassembly widget stepping
This commit is contained in:
commit
1fc0347d27
src/citra_qt
@ -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; });
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user