From d6a41b32905a0ab95b63c1df6480b715ce21ade7 Mon Sep 17 00:00:00 2001 From: bunnei Date: Wed, 25 Jan 2023 20:35:58 -0800 Subject: android: jni: native: Add lock around HaltEmulation, tighten run loop. --- src/android/app/src/main/jni/native.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index 119c7cd01..e1b771468 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp @@ -126,6 +126,7 @@ public: } void HaltEmulation() { + std::scoped_lock lock(mutex); is_running = false; cv.notify_one(); } @@ -145,7 +146,8 @@ public: while (true) { { 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. break; } -- cgit v1.2.3