[Freeciv-Dev] Re: (PR#5098) Re: assert in goto gtk+2 client

["Gregory Berkolaiko" <Gregory.Berkolaiko@xxxxxxxxxxxx>]

> > Paul Zastoupil wrote:
> > > gtk+2 client was getting a bit sluggish as the game went on.
> > > 
> > > On trying to goto with a helicopter, bang, core.
> > > 
> > > civclient: control.c:607: request_unit_goto: Assertion `goto_is_active()' 
> > > failed.
> > > 
> > > Hitting G twice I was able to reproduce it. 
> > > 
> > > Not sure if you need a savegame but I have one.

Attached patch should help.

G.

Index: client/control.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/control.c,v
retrieving revision 1.108
diff -u -r1.108 control.c
--- client/control.c    2003/08/11 02:31:38     1.108
+++ client/control.c    2003/08/21 23:25:17
@@ -603,7 +603,7 @@
       enter_goto_state(punit);
       create_line_at_mouse_pos();
     }
-  } else if (!is_air_unit(punit)) {
+  } else if (!is_air_unit(punit) && !is_heli_unit(punit)) {
     assert(goto_is_active());
     goto_add_waypoint();
   }