Author: cazfi
Date: Wed Sep 9 17:43:25 2015
New Revision: 29835
URL: http://svn.gna.org/viewcvs/freeciv?rev=29835&view=rev
Log:
Free overview canvas on exit.
See patch #6326
Modified:
branches/S2_5/client/client_main.c
branches/S2_5/client/overview_common.c
branches/S2_5/client/overview_common.h
Modified: branches/S2_5/client/client_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/client_main.c?rev=29835&r1=29834&r2=29835&view=diff
==============================================================================
--- branches/S2_5/client/client_main.c (original)
+++ branches/S2_5/client/client_main.c Wed Sep 9 17:43:25 2015
@@ -638,9 +638,10 @@
if (save_options_on_exit) {
options_save();
}
-
+
+ overview_free();
tileset_free(tileset);
-
+
ui_exit();
script_client_free();
Modified: branches/S2_5/client/overview_common.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/overview_common.c?rev=29835&r1=29834&r2=29835&view=diff
==============================================================================
--- branches/S2_5/client/overview_common.c (original)
+++ branches/S2_5/client/overview_common.c Wed Sep 9 17:43:25 2015
@@ -486,6 +486,19 @@
}
/****************************************************************************
+ Free overview resources.
+****************************************************************************/
+void overview_free(void)
+{
+ if (overview.map) {
+ canvas_free(overview.map);
+ canvas_free(overview.window);
+ overview.map = NULL;
+ overview.window = NULL;
+ }
+}
+
+/****************************************************************************
Callback to be called when an overview option is changed.
****************************************************************************/
void overview_redraw_callback(struct option *option)
Modified: branches/S2_5/client/overview_common.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/overview_common.h?rev=29835&r1=29834&r2=29835&view=diff
==============================================================================
--- branches/S2_5/client/overview_common.h (original)
+++ branches/S2_5/client/overview_common.h Wed Sep 9 17:43:25 2015
@@ -69,6 +69,7 @@
void refresh_overview_from_canvas(void);
void overview_update_tile(struct tile *ptile);
void calculate_overview_dimensions(void);
+void overview_free(void);
void center_tile_overviewcanvas(void);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
