From f0e8a3d12f90fe2e4a6038b3ba95693db27b64e1 Mon Sep 17 00:00:00 2001 From: pelya Date: Sat, 23 Mar 2013 19:52:06 +0200 Subject: [PATCH] More semaphores in Java code --- project/java/MainActivity.java | 4 ++++ project/jni/application/openarena/engine | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/project/java/MainActivity.java b/project/java/MainActivity.java index 6f1820709..8c4cdc476 100644 --- a/project/java/MainActivity.java +++ b/project/java/MainActivity.java @@ -100,6 +100,8 @@ public class MainActivity extends Activity _layout2 = new LinearLayout(this); _layout2.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)); + final Semaphore loadedLibraries = new Semaphore(0); + if( Globals.StartupMenuButtonTimeout > 0 ) { _btn = new Button(this); @@ -113,6 +115,7 @@ public class MainActivity extends Activity { setUpStatusLabel(); System.out.println("libSDL: User clicked change phone config button"); + loadedLibraries.acquireUninterruptibly(); Settings.showConfig(p, false); } }; @@ -173,6 +176,7 @@ public class MainActivity extends Activity { Settings.Load(Parent); loaded.release(); + loadedLibraries.release(); } } Callback2 cb = new Callback2(); diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine index af105be9e..3770fe9b6 160000 --- a/project/jni/application/openarena/engine +++ b/project/jni/application/openarena/engine @@ -1 +1 @@ -Subproject commit af105be9ec78d61b5642298687b8bedfb9bc12ac +Subproject commit 3770fe9b65b9e0b6588fe35a59f7a3a49ec8629e