RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-10 14:12:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

GDBSafe mode that disables some dangerous operations

Browse Source
This commit is contained in:
mittorn
2017-04-25 23:52:09 +00:00
parent 7c44e6451a
commit 6f5e809507
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jni/src/Xash3D/xash3d
+1 -1
Submodule jni/src/Xash3D/xash3d updated: b7627d1a64...9558d126d5
src/in/celest/xash3d/XashActivity.java
+15 -2
View File
@@ -58,6 +58,7 @@ public class XashActivity extends Activity {
public static boolean mEnginePaused = false;
public static Vibrator mVibrator;
public static boolean fMouseShown = true;
public static boolean fGDBSafe = false;
private static boolean mHasVibrator;
private int mReturingWithResultCode = 0;
@@ -445,7 +446,13 @@ public class XashActivity extends Activity {
String gamelibdir = getStringExtraFromIntent(intent, "gamelibdir", enginedir);
String gamedir = getStringExtraFromIntent(intent, "gamedir", "valve");
String basedir = getStringExtraFromIntent(intent, "basedir", mPref.getString("basedir","/sdcard/xash/"));
String gdbsafe = intent.getStringExtra("gdbsafe");
if( gdbsafe != null )
fGDBSafe = true;
if( Debug.isDebuggerConnected() )
fGDBSafe = true;
if( fGDBSafe )
Log.e(TAG, "GDBSafe mode enabled!");
mArgv = argv.split(" ");
setenv("XASH3D_BASEDIR", basedir, true);
@@ -788,6 +795,8 @@ public class XashActivity extends Activity {
public static void setIcon(String path)
{
if( fGDBSafe )
return;
Log.v(TAG,"setIcon("+path+")");
if( sdk < 5 )
return;
@@ -801,7 +810,7 @@ public class XashActivity extends Activity {
((NotificationManager) mSingleton.getApplicationContext()
.getSystemService(Context.NOTIFICATION_SERVICE)).notify(100,XashService.notification);
}
catch( Exception e)
catch( Exception e )
{
}
}
@@ -942,6 +951,8 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
public void engineThreadWait()
{
if( XashActivity.fGDBSafe )
return;
Log.v(TAG, "engineThreadWait()");
synchronized(mPauseLock)
{
@@ -958,6 +969,8 @@ class EngineSurface extends SurfaceView implements SurfaceHolder.Callback, View.
public void engineThreadNotify()
{
if( XashActivity.fGDBSafe )
return;
Log.v(TAG, "engineThreadNotify()");
synchronized(mPauseLock)
{