Author: cazfi Date: Tue Sep 27 20:35:19 2016 New Revision: 33914 URL: http://svn.gna.org/viewcvs/freeciv?rev=33914&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_5/client/gui-gtk-2.0/gui_main.c branches/S2_5/client/gui-gtk-3.0/gui_main.c branches/S2_5/client/gui-qt/gui_main.cpp Modified: branches/S2_5/client/gui-gtk-2.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/gui_main.c?rev=33914&r1=33913&r2=33914&view=diff ============================================================================== --- branches/S2_5/client/gui-gtk-2.0/gui_main.c (original) +++ branches/S2_5/client/gui-gtk-2.0/gui_main.c Tue Sep 27 20:35:19 2016 @@ -1731,7 +1731,6 @@ gui_up = TRUE; gtk_main(); gui_up = FALSE; - start_quitting(); destroy_server_scans(); free_mapcanvas_and_overview(); @@ -2057,6 +2056,7 @@ { gtk_widget_destroy(dialog); if (response == GTK_RESPONSE_YES) { + start_quitting(); if (client.conn.used) { disconnect_from_server(); } Modified: branches/S2_5/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/gui_main.c?rev=33914&r1=33913&r2=33914&view=diff ============================================================================== --- branches/S2_5/client/gui-gtk-3.0/gui_main.c (original) +++ branches/S2_5/client/gui-gtk-3.0/gui_main.c Tue Sep 27 20:35:19 2016 @@ -1804,7 +1804,6 @@ gui_up = TRUE; gtk_main(); gui_up = FALSE; - start_quitting(); destroy_server_scans(); free_mapcanvas_and_overview(); @@ -2128,6 +2127,7 @@ { gtk_widget_destroy(dialog); if (response == GTK_RESPONSE_YES) { + start_quitting(); if (client.conn.used) { disconnect_from_server(); } Modified: branches/S2_5/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/gui_main.cpp?rev=33914&r1=33913&r2=33914&view=diff ============================================================================== --- branches/S2_5/client/gui-qt/gui_main.cpp (original) +++ branches/S2_5/client/gui-qt/gui_main.cpp Tue Sep 27 20:35:19 2016 @@ -169,7 +169,6 @@ qapp->setStyle(QStyleFactory::create(gui_qt_default_theme_name)); freeciv_qt = new fc_client(); freeciv_qt->main(qapp); - start_quitting(); } } @@ -479,6 +478,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