From 4736330c55ea539b4678483d7ecbb9b50f798936 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Thu, 2 Mar 2017 22:00:55 +0100
Subject: [PATCH] Don't double-lock a regular mutex, bad things happen. Fixes
 #9376

---
 android/jni/app-android.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 6a231cd851..b6bda76520 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -713,7 +713,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeRenderer_displayRender(JNIEnv *env,
 			frameCommands.pop();
 		return;
 	}
-
+	// Still under lock here.
 	ProcessFrameCommands(env);
 }
 
@@ -1001,8 +1001,8 @@ extern "C" jint JNICALL Java_org_ppsspp_ppsspp_NativeApp_getDesiredBackbufferHei
 	return desiredBackbufferSizeY;
 }
 
+// Call this under frameCommandLock.
 static void ProcessFrameCommands(JNIEnv *env) {
-	std::lock_guard<std::mutex> guard(frameCommandLock);
 	while (!frameCommands.empty()) {
 		FrameCommand frameCmd;
 		frameCmd = frameCommands.front();