[Freeciv-Dev] Re: (PR#11612) 0: tech "None": requires itself

["Mike Kaufman" <kaufman@xxxxxxxxxxxxxxxxxxxxxx>]

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

here's a patch.

-mikE

? 11612.diff
? gamelog
? client/gui-gtk/.deps
? client/gui-gtk/Freeciv.h
? client/gui-gtk/Makefile
? client/gui-gtk/Makefile.in
? server/.stdinhand.c.swp
Index: server/stdinhand.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v
retrieving revision 1.391
diff -u -r1.391 stdinhand.c
--- server/stdinhand.c  25 Mar 2005 18:26:05 -0000      1.391
+++ server/stdinhand.c  30 Mar 2005 05:59:59 -0000
@@ -2960,10 +2960,6 @@
     sz_strlcpy(pplayer->name, pconn->username);
   }
 
-  /* aitoggle the player back to human if necessary. */
-  if (pplayer->ai.control && game.auto_ai_toggle) {
-    toggle_ai_player_direct(NULL, pplayer);
-  }
 
   if (server_state == RUN_GAME_STATE) {
     send_packet_freeze_hint(pconn);
@@ -2974,6 +2970,15 @@
     send_diplomatic_meetings(pconn);
     send_packet_thaw_hint(pconn);
     dsend_packet_start_phase(pconn, game.phase);
+  }
+
+  /* aitoggle the player back to human if necessary. */
+  if (pplayer->ai.control && game.auto_ai_toggle) {
+    toggle_ai_player_direct(NULL, pplayer);
+  }
+
+  /* yes this has to go after the toggle check */
+  if (server_state == RUN_GAME_STATE) {
     gamelog(GAMELOG_PLAYER, pplayer);
   }