<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39868 >

Found it!  After straightening the code, and getting some sleep, the answer
leaped right out.  When taking a unit out of sentry by client instead of
server, it is already in the focus, and should not be added to the queue.

Committed S2_1 revision 13990.
Committed S2_2 revision 13991.
Committed trunk revision 13992.

Please verify.


Index: client/packhand.c
===================================================================
--- client/packhand.c   (revision 13989)
+++ client/packhand.c   (working copy)
@@ -1083,6 +1083,7 @@
           && unit_owner(punit) == game.player_ptr
           && punit->activity == ACTIVITY_SENTRY
           && packet_unit->activity == ACTIVITY_IDLE
+         && !unit_is_in_focus(punit)
          && is_player_phase(game.player_ptr, game.info.phase)) {
         /* many wakeup units per tile are handled */
         urgent_unit_focus(punit);
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to