# HG changeset patch # User nemo # Date 1418054156 18000 # Node ID 99975e1860d2a355d4587d8d8b62377e270d83b1 # Parent 13a5dd92ebf9d4094bb06389f5d34736d2f39266 oh, probably need nil checks here too diff -r 13a5dd92ebf9 -r 99975e1860d2 hedgewars/uGearsList.pas --- a/hedgewars/uGearsList.pas Mon Dec 08 10:30:20 2014 -0500 +++ b/hedgewars/uGearsList.pas Mon Dec 08 10:55:56 2014 -0500 @@ -726,9 +726,11 @@ FollowGear:= nil; if lastGearByUID = Gear then lastGearByUID := nil; -if Gear^.Hedgehog^.GearHidden <> Gear then // hidden hedgehogs shouldn't be in the list +if (Gear^.Hedgehog = nil) or (Gear^.Hedgehog^.GearHidden <> Gear) then // hidden hedgehogs shouldn't be in the list RemoveGearFromList(Gear); -Gear^.Hedgehog^.GearHidden:= nil; +if (Gear^.Hedgehog <> nil) and (Gear^.Hedgehog^.GearHidden = Gear) then + Gear^.Hedgehog^.GearHidden:= nil; + Dispose(Gear) end;