franklinblanco
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: jni: native: Add lock around HaltEmulation, tighten run loop.

This commit is contained in:
bunnei 2023-01-25 20:35:58 -08:00
parent d553fd4c3a
commit d6a41b3290
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/jni/native.cpp
View File

@ -126,6 +126,7 @@ public:
} }
void HaltEmulation() { void HaltEmulation() {
std::scoped_lock lock(mutex);
is_running = false; is_running = false;
cv.notify_one(); cv.notify_one();
} }
@ -145,7 +146,8 @@ public:
while (true) { while (true) {
{ {
std::unique_lock lock(mutex); std::unique_lock lock(mutex);
if (cv.wait_for(lock, std::chrono::seconds(1), [&]() { return !is_running; })) { if (cv.wait_for(lock, std::chrono::milliseconds(100),
[&]() { return !is_running; })) {
// Emulation halted. // Emulation halted.
break; break;
} }