citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #924 from aroulin/qt-disassembly-step 

Qt: Fix disassembly widget stepping
This commit is contained in:
Yuri Kunde Schlesner 2015-07-13 14:16:36 -07:00
parent bf80ae6a1a 7ccce98389
commit 1fc0347d27
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/bootmanager.cpp
View File

@ -65,7 +65,7 @@ void EmuThread::run() {
was_active = false; was_active = false;
} else { } else {
std::unique_lock<std::mutex> lock(running_mutex); 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; });
} }
} }

5
src/citra_qt/bootmanager.h
View File

@ -35,7 +35,10 @@ public:
* Steps the emulation thread by a single CPU instruction (if the CPU is not already running) * Steps the emulation thread by a single CPU instruction (if the CPU is not already running)
* @note This function is thread-safe * @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 * Sets whether the emulation thread is running or not