[Freeciv-Dev] (PR#15235) GGZ mode: go straight into start page

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

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

This patch causes the client to go straight into the start (pregame) 
page when with_ggz is set.  Without this the user gets the chance to 
fiddle around in the main page even while the GGZ connection is being 
made...which is quite bad.

-jason

Index: client/packhand.c
===================================================================
--- client/packhand.c   (revision 11490)
+++ client/packhand.c   (working copy)
@@ -51,6 +51,7 @@
 #include "connectdlg_g.h"
 #include "control.h"
 #include "dialogs_g.h"
+#include "ggzclient.h"
 #include "goto.h"               /* client_goto_init() */
 #include "graphics_g.h"
 #include "gui_main_g.h"
@@ -201,7 +202,9 @@
       freelog(LOG_NORMAL, "%s", msg);
     }
     gui_server_connect();
-    set_client_page(in_ggz ? PAGE_MAIN : PAGE_GGZ);
+    if (!with_ggz) {
+      set_client_page(in_ggz ? PAGE_MAIN : PAGE_GGZ);
+    }
   }
   if (strcmp(s_capability, our_capability) == 0) {
     return;
Index: client/clinet.c
===================================================================
--- client/clinet.c     (revision 11490)
+++ client/clinet.c     (working copy)
@@ -117,7 +117,9 @@
   remove_net_input();
   popdown_races_dialog(); 
   close_connection_dialog();
-  set_client_page(in_ggz ? PAGE_GGZ : PAGE_MAIN);
+  if (!with_ggz) {
+    set_client_page(in_ggz ? PAGE_GGZ : PAGE_MAIN);
+  }
 
   reports_force_thaw();
   
Index: client/civclient.c
===================================================================
--- client/civclient.c  (revision 11490)
+++ client/civclient.c  (working copy)
@@ -559,7 +559,7 @@
        client_game_free();
       }
       client_game_init();
-      if (!aconnection.established) {
+      if (!aconnection.established && !with_ggz) {
        set_client_page(in_ggz ? PAGE_GGZ : PAGE_MAIN);
       } else {
        set_client_page(PAGE_START);