From 06359502e196c3916e12d8f8b36b983f3b93bfac Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sat, 22 Jul 2017 13:49:07 +0700
Subject: [PATCH] Add wait timeouts

---
 jni/src/NanoGL/nanogl                  | 2 +-
 jni/src/Xash3D/xash3d                  | 2 +-
 jni/src/hlsdk-xash3d                   | 2 +-
 src/in/celest/xash3d/CertCheck.java    | 4 +---
 src/in/celest/xash3d/XashActivity.java | 7 +++----
 src/in/celest/xash3d/XashService.java  | 1 -
 src/org/json                           | 1 -
 7 files changed, 7 insertions(+), 12 deletions(-)
 delete mode 160000 src/org/json

diff --git a/jni/src/NanoGL/nanogl b/jni/src/NanoGL/nanogl
index c9df6deb..ae8ec8d2 160000
--- a/jni/src/NanoGL/nanogl
+++ b/jni/src/NanoGL/nanogl
@@ -1 +1 @@
-Subproject commit c9df6debac1019db0571b92df54a3ae8d5b3454f
+Subproject commit ae8ec8d2041e425816c1f04421a12c17ade5e30e
diff --git a/jni/src/Xash3D/xash3d b/jni/src/Xash3D/xash3d
index 1df40508..eee76411 160000
--- a/jni/src/Xash3D/xash3d
+++ b/jni/src/Xash3D/xash3d
@@ -1 +1 @@
-Subproject commit 1df40508c08d633e3db63e7f586025826c9f97e1
+Subproject commit eee764111309c3846927301f094d0e5d30a6ead7
diff --git a/jni/src/hlsdk-xash3d b/jni/src/hlsdk-xash3d
index e099224b..21317e7d 160000
--- a/jni/src/hlsdk-xash3d
+++ b/jni/src/hlsdk-xash3d
@@ -1 +1 @@
-Subproject commit e099224bc5948dd604632f1602017b99cb29cc90
+Subproject commit 21317e7da39a8c74b3690ccb4713e6e6d2ed2556
diff --git a/src/in/celest/xash3d/CertCheck.java b/src/in/celest/xash3d/CertCheck.java
index 25a82a37..5ca23add 100644
--- a/src/in/celest/xash3d/CertCheck.java
+++ b/src/in/celest/xash3d/CertCheck.java
@@ -17,7 +17,6 @@ import java.lang.*;
 import java.util.List;
 import java.security.MessageDigest;
 
-import in.celest.xash3d.hl.BuildConfig;
 import in.celest.xash3d.XashConfig;
 
 public class CertCheck
@@ -30,8 +29,7 @@ public class CertCheck
 
 	public static boolean dumbAntiPDALifeCheck( Context context )
 	{
-		if( BuildConfig.DEBUG || 
-			!XashConfig.CHECK_SIGNATURES )
+		if( !XashConfig.CHECK_SIGNATURES )
 			return false; // disable checking for debug builds
 	
 		try
diff --git a/src/in/celest/xash3d/XashActivity.java b/src/in/celest/xash3d/XashActivity.java
index bf53d48e..5a8140b1 100644
--- a/src/in/celest/xash3d/XashActivity.java
+++ b/src/in/celest/xash3d/XashActivity.java
@@ -31,7 +31,6 @@ import java.util.List;
 import java.security.MessageDigest;
 
 import in.celest.xash3d.hl.R;
-import in.celest.xash3d.hl.BuildConfig;
 import in.celest.xash3d.XashConfig;
 import in.celest.xash3d.JoystickHandler;
 import in.celest.xash3d.CertCheck;
@@ -942,7 +941,7 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
 		Log.v(TAG, "engineThreadJoin()");
 		try
 		{
-			mEngThread.join(); // wait until Xash will quit
+			mEngThread.join(5000); // wait until Xash will quit
 		}
 		catch(InterruptedException e)
 		{
@@ -958,7 +957,7 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
 		{
 			try
 			{
-				mPauseLock.wait(); // wait until Xash will quit
+				mPauseLock.wait(5000); // wait until engine notify
 			}
 			catch(InterruptedException e)
 			{
@@ -974,7 +973,7 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
 		Log.v(TAG, "engineThreadNotify()");
 		synchronized(mPauseLock)
 		{
-			mPauseLock.notify(); // wait until Xash will quit
+			mPauseLock.notify(); // send notify
 		}
 	}
 
diff --git a/src/in/celest/xash3d/XashService.java b/src/in/celest/xash3d/XashService.java
index ced402e6..00457d8b 100644
--- a/src/in/celest/xash3d/XashService.java
+++ b/src/in/celest/xash3d/XashService.java
@@ -30,7 +30,6 @@ import java.util.List;
 import java.security.MessageDigest;
 
 import in.celest.xash3d.hl.R;
-import in.celest.xash3d.hl.BuildConfig;
 import in.celest.xash3d.XashConfig;
 import in.celest.xash3d.JoystickHandler;
 import in.celest.xash3d.CertCheck;
diff --git a/src/org/json b/src/org/json
deleted file mode 160000
index c24be0e4..00000000
--- a/src/org/json
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c24be0e4ea1828fdfadc74df356025f6fb126c52