--- a/hedgewars/uInputHandler.pas	Mon Jun 04 19:43:39 2012 -0400
+++ b/hedgewars/uInputHandler.pas	Tue Jun 05 19:33:49 2012 +0200
@@ -239,11 +239,19 @@
 end;
 
 procedure SetBinds(var binds: TBinds);
+{$IFNDEF MOBILE}
+var
+    t: LongInt;
+{$ENDIF}
 begin
 {$IFDEF MOBILE}
     binds:= binds; // avoid hint
     CurrentBinds:= DefaultBinds;
 {$ELSE}
+for t:= 0 to cKeyMaxIndex do
+    if (CurrentBinds[t] <> binds[t]) and tkbd[t] then
+        ProcessKey(t, False);
+
     CurrentBinds:= binds;
 {$ENDIF}
 end;

--- a/hedgewars/uTeams.pas	Mon Jun 04 19:43:39 2012 -0400
+++ b/hedgewars/uTeams.pas	Tue Jun 05 19:33:49 2012 +0200
@@ -248,8 +248,6 @@
     FollowGear:= Gear
     end;
 
-ResetKbd;
-
 if (GameFlags and gfDisableWind) = 0 then
     begin
     cWindSpeed:= rndSign(GetRandomf * 2 * cMaxWindSpeed);