diff -r 65a022bf6bde -r 9e6e8e5a4c2e hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Thu Jun 07 22:40:28 2012 +0200
+++ b/hedgewars/GSHandlers.inc	Fri Jun 08 14:30:46 2012 +0400
@@ -3438,7 +3438,7 @@
         PlaySound(sndGun);
         end;
 
-    if (Gear^.Timer = 0) or (HHGear^.Damage <> 0) then
+    if (Gear^.Timer = 0) or ((HHGear^.State and gstHHDriven) = 0) then
         begin
         DeleteGear(Gear);
         AfterAttack