Author: cazfi
Date: Wed May 4 00:03:45 2016
New Revision: 32566
URL: http://svn.gna.org/viewcvs/freeciv?rev=32566&view=rev
Log:
Disconnect gtk-clients cleanly from the server even when Quitting client,
instead of just Leaving game.
See bug #24629
Modified:
trunk/client/gui-gtk-2.0/gui_main.c
trunk/client/gui-gtk-3.0/gui_main.c
trunk/client/gui-gtk-3.x/gui_main.c
Modified: trunk/client/gui-gtk-2.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/gui_main.c?rev=32566&r1=32565&r2=32566&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/gui_main.c (original)
+++ trunk/client/gui-gtk-2.0/gui_main.c Wed May 4 00:03:45 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -1988,6 +1988,9 @@
{
gtk_widget_destroy(dialog);
if (response == GTK_RESPONSE_YES) {
+ if (client.conn.used) {
+ disconnect_from_server();
+ }
quit_gtk_main();
}
}
Modified: trunk/client/gui-gtk-3.0/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gui_main.c?rev=32566&r1=32565&r2=32566&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/gui_main.c (original)
+++ trunk/client/gui-gtk-3.0/gui_main.c Wed May 4 00:03:45 2016
@@ -2072,6 +2072,9 @@
{
gtk_widget_destroy(dialog);
if (response == GTK_RESPONSE_YES) {
+ if (client.conn.used) {
+ disconnect_from_server();
+ }
quit_gtk_main();
}
}
Modified: trunk/client/gui-gtk-3.x/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/gui_main.c?rev=32566&r1=32565&r2=32566&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.x/gui_main.c (original)
+++ trunk/client/gui-gtk-3.x/gui_main.c Wed May 4 00:03:45 2016
@@ -2093,6 +2093,9 @@
{
gtk_widget_destroy(dialog);
if (response == GTK_RESPONSE_YES) {
+ if (client.conn.used) {
+ disconnect_from_server();
+ }
quit_gtk_main();
}
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
