From 45a7e6269b2328de9178af76ff4aed41c2e69129 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 11 Sep 2017 19:52:07 +0100 Subject: Treeview: Slight simplification of treeview_walk_internal(). --- desktop/treeview.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/desktop/treeview.c b/desktop/treeview.c index e6dcbc032..a6e3e609b 100644 --- a/desktop/treeview.c +++ b/desktop/treeview.c @@ -566,13 +566,12 @@ treeview_walk_internal(treeview_node *root, node = root; parent = node->parent; next_sibling = node->next_sib; - child = (!skip_children && - (full || (node->flags & TV_NFLAGS_EXPANDED))) ? + child = (full || (node->flags & TV_NFLAGS_EXPANDED)) ? node->children : NULL; while (node != NULL) { - if (child != NULL) { + if (child != NULL && !skip_children) { /* Down to children */ node = child; } else { @@ -639,7 +638,6 @@ treeview_walk_internal(treeview_node *root, return NSERROR_OK; } } - child = skip_children ? NULL : child; } return NSERROR_OK; } -- cgit v1.2.3