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

server_shutdown() gets called after my_shutdown_network(), but it still
uses network functionality (for send_chat("/quit")). The attached patch
moves the my_shutdown_network() call to the end of the server_shutdown()
function.
Index: client/civclient.c
===================================================================
--- client/civclient.c	(revision 13538)
+++ client/civclient.c	(working copy)
@@ -379,7 +379,6 @@
 {
   attribute_flush();
   client_remove_all_cli_conn();
-  my_shutdown_network();
 
   if (save_options_on_exit) {
     save_options();
Index: client/connectdlg_common.c
===================================================================
--- client/connectdlg_common.c	(revision 13538)
+++ client/connectdlg_common.c	(working copy)
@@ -177,6 +177,7 @@
 static void server_shutdown(void)
 {
   client_kill_server(TRUE);
+  my_shutdown_network();
 }
                                                                                
 /**************************************************************** 
Index: client/civclient.c
===================================================================
--- client/civclient.c	(revision 13539)
+++ client/civclient.c	(working copy)
@@ -360,7 +360,6 @@
 {
   attribute_flush();
   client_remove_all_cli_conn();
-  my_shutdown_network();
 
   client_game_free();
 
Index: client/connectdlg_common.c
===================================================================
--- client/connectdlg_common.c	(revision 13539)
+++ client/connectdlg_common.c	(working copy)
@@ -184,6 +184,7 @@
 static void server_shutdown(void)
 {
   client_kill_server(TRUE);
+  my_shutdown_network();
 }
                                                                                
 /**************************************************************** 
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to