diff --git a/project/java/Settings.java b/project/java/Settings.java
index 70409c7ad..cffd8d8f8 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -2406,8 +2406,11 @@ class Settings
 		{
 			if( !Globals.AppUsesGyroscope || !AccelerometerReader.gyro.available(p) )
 			{
-				Toast toast = Toast.makeText(p, p.getResources().getString(R.string.calibrate_gyroscope_not_supported), Toast.LENGTH_LONG);
-				toast.show();
+				if( Globals.AppUsesGyroscope )
+				{
+					Toast toast = Toast.makeText(p, p.getResources().getString(R.string.calibrate_gyroscope_not_supported), Toast.LENGTH_LONG);
+					toast.show();
+				}
 				goBack(p);
 				return;
 			}
diff --git a/project/jni/application/openarena/engine b/project/jni/application/openarena/engine
index 4d88204db..23419a71a 160000
--- a/project/jni/application/openarena/engine
+++ b/project/jni/application/openarena/engine
@@ -1 +1 @@
-Subproject commit 4d88204dbe500148fb572d02bcf722d22b75b82c
+Subproject commit 23419a71a13456bcc1aa27db27c9b1c99aed1801
diff --git a/project/jni/application/openarena/vm b/project/jni/application/openarena/vm
index c744424da..0838e6ace 160000
--- a/project/jni/application/openarena/vm
+++ b/project/jni/application/openarena/vm
@@ -1 +1 @@
-Subproject commit c744424da50d09fd44f55ed55dd8654245e974b2
+Subproject commit 0838e6aceca4cc982c37e378f300d65223e41f7a