Author: cazfi
Date: Wed Mar 26 20:29:13 2014
New Revision: 24732
URL: http://svn.gna.org/viewcvs/freeciv?rev=24732&view=rev
Log:
Removed duplicate metaserver scan freeing from the error handling callback.
See bug #21807
Modified:
trunk/client/gui-gtk-2.0/pages.c
trunk/client/gui-gtk-3.0/pages.c
Modified: trunk/client/gui-gtk-2.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/pages.c?rev=24732&r1=24731&r2=24732&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/pages.c (original)
+++ trunk/client/gui-gtk-2.0/pages.c Wed Mar 26 20:29:13 2014
@@ -727,18 +727,8 @@
output_window_append(ftc_client, message);
log_error("%s", message);
- switch (server_scan_get_type(scan)) {
- case SERVER_SCAN_LOCAL:
- server_scan_finish(lan_scan);
- lan_scan = NULL;
- break;
- case SERVER_SCAN_GLOBAL:
- server_scan_finish(meta_scan);
- meta_scan = NULL;
- break;
- case SERVER_SCAN_LAST:
- break;
- }
+ /* Main thread will finalize the scan later (or even concurrently) -
+ * do not do anything here to cause double free or raze condition. */
}
/**************************************************************************
Modified: trunk/client/gui-gtk-3.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/pages.c?rev=24732&r1=24731&r2=24732&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/pages.c (original)
+++ trunk/client/gui-gtk-3.0/pages.c Wed Mar 26 20:29:13 2014
@@ -749,18 +749,8 @@
output_window_append(ftc_client, message);
log_error("%s", message);
- switch (server_scan_get_type(scan)) {
- case SERVER_SCAN_LOCAL:
- server_scan_finish(lan_scan);
- lan_scan = NULL;
- break;
- case SERVER_SCAN_GLOBAL:
- server_scan_finish(meta_scan);
- meta_scan = NULL;
- break;
- case SERVER_SCAN_LAST:
- break;
- }
+ /* Main thread will finalize the scan later (or even concurrently) -
+ * do not do anything here to cause double free or raze condition. */
}
/**************************************************************************
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
