Author: cazfi Date: Wed Oct 14 18:00:05 2015 New Revision: 30079 URL: http://svn.gna.org/viewcvs/freeciv?rev=30079&view=rev Log: Fixed duoble unref of gtk-clients' messagebuffer.
See bug #23895 Modified: branches/S2_6/client/gui-gtk-2.0/gui_main.c branches/S2_6/client/gui-gtk-3.0/gui_main.c Modified: branches/S2_6/client/gui-gtk-2.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/gui_main.c?rev=30079&r1=30078&r2=30079&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-2.0/gui_main.c (original) +++ branches/S2_6/client/gui-gtk-2.0/gui_main.c Wed Oct 14 18:00:05 2015 @@ -1707,6 +1707,7 @@ cma_fe_done(); free_unit_table(); gtk_widget_destroy(toplevel_tabs); + message_buffer = NULL; /* Result of destruction of everything */ tileset_free_tiles(tileset); } @@ -1723,8 +1724,10 @@ **************************************************************************/ void ui_exit(void) { - g_object_unref(message_buffer); - message_buffer = NULL; + if (message_buffer != NULL) { + g_object_unref(message_buffer); + message_buffer = NULL; + } } /************************************************************************** Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.c?rev=30079&r1=30078&r2=30079&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.0/gui_main.c (original) +++ branches/S2_6/client/gui-gtk-3.0/gui_main.c Wed Oct 14 18:00:05 2015 @@ -1743,6 +1743,7 @@ cma_fe_done(); free_unit_table(); gtk_widget_destroy(toplevel_tabs); + message_buffer = NULL; /* Result of destruction of everything */ tileset_free_tiles(tileset); } @@ -1759,8 +1760,10 @@ **************************************************************************/ void ui_exit(void) { - g_object_unref(message_buffer); - message_buffer = NULL; + if (message_buffer != NULL) { + g_object_unref(message_buffer); + message_buffer = NULL; + } } /************************************************************************** _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits