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

Fix vibrator check

Browse Source
This commit is contained in:
mittorn
2018-06-06 01:37:58 +07:00
parent 0f02f3472e
commit bfef1cf301
2 changed files with 7 additions and 6 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: 44cfcf8a62...60be57dafe
src/in/celest/xash3d/XashActivity.java
+6 -5
View File
@@ -417,8 +417,9 @@ public class XashActivity extends Activity {
else
handler = new JoystickHandler();
handler.init();
mHasVibrator = mHasVibrator && ( handler.hasVibrator() );
mVibrator = ( Vibrator )getSystemService( Context.VIBRATOR_SERVICE );
mHasVibrator = handler.hasVibrator() && (mVibrator != null);
mPixelFormat = mPref.getInt( "pixelformat", 0 );
mUseVolume = mPref.getBoolean( "usevolume", false );
@@ -432,8 +433,6 @@ public class XashActivity extends Activity {
else mImmersiveMode = new ImmersiveMode();
mDecorView = getWindow().getDecorView();
mVibrator = ( Vibrator )getSystemService( Context.VIBRATOR_SERVICE );
if( mPref.getBoolean( "resolution_fixed", false ) )
{
@@ -2040,7 +2039,9 @@ class JoystickHandler_v12 extends JoystickHandler
@Override
public boolean hasVibrator()
{
return XashActivity.mVibrator.hasVibrator();
if( XashActivity.mVibrator != null )
return XashActivity.mVibrator.hasVibrator();
return false;
}
@Override