[Freeciv-commits] r33913 - in /branches/S2_6/client: gui-gtk-2.0/gui_main.c gui-gtk-3.0/gui_main.c gui-qt/gui_main.cpp

[cazfi74]

Author: cazfi
Date: Tue Sep 27 20:35:13 2016
New Revision: 33913

URL: http://svn.gna.org/viewcvs/freeciv?rev=33913&view=rev
Log:
Set client to quitting-mode already before disconnecting from the server
when going to shut down.

Reported by Jacob Nevins <jtn>

See bug #24844

Modified:
    branches/S2_6/client/gui-gtk-2.0/gui_main.c
    branches/S2_6/client/gui-gtk-3.0/gui_main.c
    branches/S2_6/client/gui-qt/gui_main.cpp

Modified: branches/S2_6/client/gui-gtk-2.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/gui_main.c?rev=33913&r1=33912&r2=33913&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-2.0/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-2.0/gui_main.c Tue Sep 27 20:35:13 2016
@@ -1703,7 +1703,6 @@
   gui_up = TRUE;
   gtk_main();
   gui_up = FALSE;
-  start_quitting();
 
   destroy_server_scans();
   free_mapcanvas_and_overview();
@@ -1992,6 +1991,7 @@
 {
   gtk_widget_destroy(dialog);
   if (response == GTK_RESPONSE_YES) {
+    start_quitting();
     if (client.conn.used) {
       disconnect_from_server();
     }

Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.c?rev=33913&r1=33912&r2=33913&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/gui_main.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/gui_main.c Tue Sep 27 20:35:13 2016
@@ -1833,7 +1833,6 @@
   gui_up = TRUE;
   gtk_main();
   gui_up = FALSE;
-  start_quitting();
 
   destroy_server_scans();
   free_mapcanvas_and_overview();
@@ -2120,6 +2119,7 @@
 {
   gtk_widget_destroy(dialog);
   if (response == GTK_RESPONSE_YES) {
+    start_quitting();
     if (client.conn.used) {
       disconnect_from_server();
     }

Modified: branches/S2_6/client/gui-qt/gui_main.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/gui_main.cpp?rev=33913&r1=33912&r2=33913&view=diff
==============================================================================
--- branches/S2_6/client/gui-qt/gui_main.cpp    (original)
+++ branches/S2_6/client/gui-qt/gui_main.cpp    Tue Sep 27 20:35:13 2016
@@ -189,7 +189,6 @@
 
     freeciv_qt = new fc_client();
     freeciv_qt->main(qapp);
-    start_quitting();
   }
 }
 
@@ -560,6 +559,7 @@
     return;
     break;
   case QMessageBox::Ok:
+    start_quitting();
     if (client.conn.used) {
       disconnect_from_server();
     }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits