diff --git a/build.sh b/build.sh
index 79bcb8c0d..1627fed30 100755
--- a/build.sh
+++ b/build.sh
@@ -38,6 +38,7 @@ cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j$NCPU && \
    `which ndk-build | sed 's@/ndk-build@@'`/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$MYARCH/bin/arm-linux-androideabi-strip --strip-unneeded libs/armeabi/libapplication.so \
    || true ; } && \
  ant debug && \
+ [ -n "`adb devices | tail -n +2`" ] && \
  test -z "$1" && cd bin && \
  { adb install -r MainActivity-debug.apk | grep 'Failure' && \
  adb uninstall `grep AppFullName ../../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r MainActivity-debug.apk ; true ; } && \
diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg
index 0d29ba687..c0c974655 100644
--- a/project/jni/application/commandergenius/AndroidAppSettings.cfg
+++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg
@@ -10,7 +10,7 @@ VideoDepthBpp=24
 NeedDepthBuffer=n
 NeedStencilBuffer=n
 NeedGles2=n
-SwVideoMode=y
+SwVideoMode=n
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index d4ef5612e..023025901 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit d4ef5612e979b11b07e4b35c0f683a2a8aefb19a
+Subproject commit 023025901a1d96a46d826791bf9cf264ddf5c9ee