vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add wait timeouts

Browse source
This commit is contained in:
mittorn 2017-07-22 13:49:07 +07:00
parent 0949e89c11
commit 06359502e1
7 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
jni/src/NanoGL/nanogl

@ -1 +1 @@
Subproject commit c9df6debac1019db0571b92df54a3ae8d5b3454f
Subproject commit ae8ec8d2041e425816c1f04421a12c17ade5e30e

2
jni/src/Xash3D/xash3d

@ -1 +1 @@
Subproject commit 1df40508c08d633e3db63e7f586025826c9f97e1
Subproject commit eee764111309c3846927301f094d0e5d30a6ead7

2
jni/src/hlsdk-xash3d

@ -1 +1 @@
Subproject commit e099224bc5948dd604632f1602017b99cb29cc90
Subproject commit 21317e7da39a8c74b3690ccb4713e6e6d2ed2556

4
src/in/celest/xash3d/CertCheck.java
View file

@ -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

7
src/in/celest/xash3d/XashActivity.java
View file

@ -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
}
}

1
src/in/celest/xash3d/XashService.java
View file

@ -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;

1
src/org/json

@ -1 +0,0 @@
Subproject commit c24be0e4ea1828fdfadc74df356025f6fb126c52