From 3b1992d3f4877ca5b543ecda1f242f6e6b12a016 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 18 Sep 2017 23:32:36 +0100 Subject: Treeview: Destroy search first on treeview destruction. --- desktop/treeview.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'desktop') diff --git a/desktop/treeview.c b/desktop/treeview.c index 4841db9be..01998e16e 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -2013,6 +2013,12 @@ nserror treeview_destroy(treeview *tree) assert(tree != NULL); + if (tree->search.textarea != NULL) { + tree->search.active = false; + tree->search.search = false; + textarea_destroy(tree->search.textarea); + } + /* Destroy nodes */ treeview_delete_node_internal(tree, tree->root, false, TREE_OPTION_SUPPRESS_RESIZE | @@ -2024,10 +2030,6 @@ nserror treeview_destroy(treeview *tree) } free(tree->fields); - if (tree->search.textarea != NULL) { - textarea_destroy(tree->search.textarea); - } - /* Free treeview */ free(tree); -- cgit v1.2.3