Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/3b1992d3f4877ca5b543ecda1f242f6e6b12a016
...commit
http://git.netsurf-browser.org/netsurf.git/commit/3b1992d3f4877ca5b543ecda1f242f6e6b12a016
...tree
http://git.netsurf-browser.org/netsurf.git/tree/3b1992d3f4877ca5b543ecda1f242f6e6b12a016
The branch, master has been updated
via 3b1992d3f4877ca5b543ecda1f242f6e6b12a016 (commit)
from ec4b9a5dd008785e6498dcefb025f6234965f529 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=3b1992d3f4877ca5b543ecda1f242f6e6b12a016
commit 3b1992d3f4877ca5b543ecda1f242f6e6b12a016
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Treeview: Destroy search first on treeview destruction.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 4841db9..01998e1 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);
-----------------------------------------------------------------------
Summary of changes:
desktop/treeview.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 4841db9..01998e1 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);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
