--- a/hedgewars/uGearsHandlersMess.pas	Thu Aug 15 16:07:57 2019 -0400
+++ b/hedgewars/uGearsHandlersMess.pas	Thu Aug 15 22:03:43 2019 +0200
@@ -3478,6 +3478,7 @@
         HHGear := CurrentHedgehog^.Gear;
         ApplyAmmoChanges(HHGear^.Hedgehog^);
         DeleteGear(Gear);
+        bShowSwitcher:= false;
         exit
         end;
 
@@ -3539,6 +3540,9 @@
 begin
     Gear^.doStep := @doStepSwitcherWork;
 
+    // Note: The game assumes there's at most only one gtSwitcher gear in the game.
+    bShowSwitcher:= true;
+
     HHGear := Gear^.Hedgehog^.Gear;
     OnUsedAmmo(HHGear^.Hedgehog^);
     with HHGear^ do