deadlock when pausing/resuming quickly (android)

Race condition when pausing/resuming is done from a separate thread (android): the renderer gets a result ready status for the previous emu thread, but waits on the newly created one forever.
flyinghead · Oct 25, 2024 · e221f6f · e221f6f · chrisleigh-stack · Oct 25, 2024
1 parent 8108e63
commit e221f6f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/core/emulator.cpp b/core/emulator.cpp
@@ -987,8 +987,8 @@ bool Emulator::checkStatus(bool wait)
 		std::unique_lock<std::mutex> lock(mutex);
 		if (threadResult.valid())
 		{
+            auto localResult = threadResult;
 			lock.unlock();
-			auto localResult = threadResult;
 			if (wait) {
 				localResult.wait();
 			}
@@ -997,8 +997,7 @@ bool Emulator::checkStatus(bool wait)
 				if (result == std::future_status::timeout)
 					return true;
 			}
-			lock.lock();
-			threadResult.get();
+			localResult.get();
 		}
 		return false;
 	} catch (...) {