diff --git a/data/controls.dat b/data/controls.dat
index 37379a8ec..f0d4b46a3 100644
Binary files a/data/controls.dat and b/data/controls.dat differ
diff --git a/src/sdl/CTimer.cpp b/src/sdl/CTimer.cpp
index 6f92e3fb1..8e854a753 100644
--- a/src/sdl/CTimer.cpp
+++ b/src/sdl/CTimer.cpp
@@ -81,9 +81,8 @@ void CTimer::SpeedThrottle(void)
 	 if( (ttime-ltime) < (tfreq/desiredfps) )
 	 {
 		 delay=(tfreq/desiredfps)-(ttime-ltime);
-		 if(delay>0)
-			 //SDL_Delay(delay/10000);
-			 SDL_Delay(MAX(Uint32(delay>>14),Uint32(1)));
+		 Uint32 d = delay >> 14;
+		 if(d>0) SDL_Delay(d);
 		 goto waiter;
 	 }
 	 if( (ttime-ltime) >= ((tfreq<<2)/desiredfps) )