diff --git a/changeAppSettings.sh b/changeAppSettings.sh
index 4b87daf7e..ffab8d533 100755
--- a/changeAppSettings.sh
+++ b/changeAppSettings.sh
@@ -1277,8 +1277,8 @@ for F in *.java; do
 	cat $F | sed "s/package .*;/package $AppFullName;/" >> ../src/$F # | sed 's@$@ // THIS FILE IS AUTO-GENERATED@' >>
 done
 
-if [ -e ../jni/application/src/java.diff ]; then patch < ../jni/application/src/java.diff || exit 1 ; fi
-if [ -e ../jni/application/src/java.patch ]; then patch < ../jni/application/src/java.patch || exit 1 ; fi
+if [ -e ../jni/application/src/java.diff ]; then patch -d ../src < ../jni/application/src/java.diff || exit 1 ; fi
+if [ -e ../jni/application/src/java.patch ]; then patch -d ../src < ../jni/application/src/java.patch || exit 1 ; fi
 
 cd ../..
 
diff --git a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
index 5462d46a9..024a4eafe 100644
--- a/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
+++ b/project/jni/sdl-1.2/src/video/android/SDL_androidinput.c
@@ -112,7 +112,8 @@ static int rightClickTimeout = 0;
 static int mouseInitialX = -1;
 static int mouseInitialY = -1;
 static unsigned int mouseInitialTime = 0;
-static volatile int deferredMouseTap = 0;
+static int deferredMouseTap = 0;
+static unsigned int leftButtonDownTime = 0;
 static int relativeMovement = 0;
 static int relativeMovementSpeed = 2;
 static int relativeMovementAccel = 0;
@@ -533,6 +534,7 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMotionEvent) ( JNIEnv*  env, jobject  t
 				SDL_ANDROID_moveMouseWithKbY = SDL_ANDROID_currentMouseY;
 				SDL_ANDROID_moveMouseWithKbSpeedX = 0;
 				SDL_ANDROID_moveMouseWithKbSpeedY = 0;
+				leftButtonDownTime = SDL_GetTicks();
 				action = MOUSE_MOVE;
 			}
 			else
@@ -572,7 +574,8 @@ JAVA_EXPORT_NAME(DemoGLSurfaceView_nativeMotionEvent) ( JNIEnv*  env, jobject  t
 				*/
 				// Mouse follows touch instantly, when it's out of the snapping distance from mouse cursor
 				if( abs(SDL_ANDROID_moveMouseWithKbX - x) >= SDL_ANDROID_sFakeWindowWidth / 10 ||
-					abs(SDL_ANDROID_moveMouseWithKbY - y) >= SDL_ANDROID_sFakeWindowHeight / 10 )
+					abs(SDL_ANDROID_moveMouseWithKbY - y) >= SDL_ANDROID_sFakeWindowHeight / 10 ||
+					SDL_GetTicks() - leftButtonDownTime > 600)
 				{
 					SDL_ANDROID_moveMouseWithKbX = -1;
 					SDL_ANDROID_moveMouseWithKbY = -1;