RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files

2
jni/src/NanoGL/nanogl

Submodule jni/src/NanoGL/nanogl updated: c9df6debac...ae8ec8d204

2
jni/src/Xash3D/xash3d

Submodule jni/src/Xash3D/xash3d updated: 1df40508c0...eee7641113

2
jni/src/hlsdk-xash3d

Submodule jni/src/hlsdk-xash3d updated: e099224bc5...21317e7da3

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

Submodule src/org/json deleted from c24be0e4ea