diff -r 2cbc57db82e1 -r 5b525d041fb4 hedgewars/uCommandHandlers.pas --- a/hedgewars/uCommandHandlers.pas Mon Apr 10 19:08:00 2017 +0200 +++ b/hedgewars/uCommandHandlers.pas Mon Apr 10 20:56:01 2017 +0200 @@ -554,7 +554,7 @@ if bShowAmmoMenu then bShowAmmoMenu:= false - else if not(CurrentTeam^.Extdriven) and (((Gear^.State and (gstAttacking or gstAttacked)) <> 0) + else if not(CurrentTeam^.Extdriven) and ((Gear = nil) or ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or ((Gear^.State and gstHHDriven) = 0)) then begin end