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

Make force-quit after engine wait timeout

Browse source
This commit is contained in:
mittorn 2017-07-22 13:51:07 +07:00
parent 06359502e1
commit 1018169842
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,8 +47,12 @@ public class XashService extends Service {
public static class exitButtonListener extends BroadcastReceiver { public static class exitButtonListener extends BroadcastReceiver {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
XashActivity.mEngineReady = false;
XashActivity.nativeUnPause(); XashActivity.nativeUnPause();
XashActivity.nativeOnDestroy(); XashActivity.nativeOnDestroy();
if( XashActivity.mSurface != null )
XashActivity.mSurface.engineThreadJoin();
System.exit(0);
} }
} }
@ -104,11 +108,14 @@ public class XashService extends Service {
@Override @Override
public void onTaskRemoved(Intent rootIntent) { public void onTaskRemoved(Intent rootIntent) {
Log.e("XashService", "OnTaskRemoved"); Log.e("XashService", "OnTaskRemoved");
if( XashActivity.mEngineReady ) //if( XashActivity.mEngineReady )
{ {
XashActivity.mEngineReady = false; XashActivity.mEngineReady = false;
XashActivity.nativeUnPause(); XashActivity.nativeUnPause();
XashActivity.nativeOnDestroy(); XashActivity.nativeOnDestroy();
if( XashActivity.mSurface != null )
XashActivity.mSurface.engineThreadJoin();
System.exit(0);
} }
stopSelf(); stopSelf();
} }