From b10252e3255df587ef4f64ee592c90f3e22a25ba Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 9 Sep 2013 13:00:24 +0100 Subject: Protect against attempt to initialise twice. --- desktop/treeview.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/desktop/treeview.c b/desktop/treeview.c index 3f445bc17..41d176f2e 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -33,6 +33,7 @@ #define REDRAW_MAX 8000 struct treeview_globals { + bool initialised; int line_height; int furniture_width; int step_width; @@ -3564,6 +3565,9 @@ nserror treeview_init(void) int font_px_size; int font_pt_size = 11; + if (tree_g.initialised == true) + return NSERROR_OK; + treeview_init_plot_styles(font_pt_size); treeview_init_resources(); treeview_init_furniture(); @@ -3577,6 +3581,8 @@ nserror treeview_init(void) tree_g.icon_step = 23; tree_g.move_offset = 18; + tree_g.initialised = true; + return NSERROR_OK; } @@ -3590,5 +3596,7 @@ nserror treeview_fini(void) hlcache_handle_release(treeview_res[i].c); } + tree_g.initialised = false; + return NSERROR_OK; } -- cgit v1.2.3