Author: cazfi Date: Wed Mar 26 20:29:18 2014 New Revision: 24733 URL: http://svn.gna.org/viewcvs/freeciv?rev=24733&view=rev Log: Removed duplicate metaserver scan freeing from the error handling callback.
See bug #21807 Modified: branches/S2_5/client/gui-gtk-2.0/pages.c branches/S2_5/client/gui-gtk-3.0/pages.c Modified: branches/S2_5/client/gui-gtk-2.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/pages.c?rev=24733&r1=24732&r2=24733&view=diff ============================================================================== --- branches/S2_5/client/gui-gtk-2.0/pages.c (original) +++ branches/S2_5/client/gui-gtk-2.0/pages.c Wed Mar 26 20:29:18 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: branches/S2_5/client/gui-gtk-3.0/pages.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/pages.c?rev=24733&r1=24732&r2=24733&view=diff ============================================================================== --- branches/S2_5/client/gui-gtk-3.0/pages.c (original) +++ branches/S2_5/client/gui-gtk-3.0/pages.c Wed Mar 26 20:29:18 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