Update the liveinfo.

[apps/livebox/data-provider-master.git] / util_liveinfo / src / node.c

diff --git a/util_liveinfo/src/node.c b/util_liveinfo/src/node.c
index 4ab1573..108f4c6 100644 (file)
--- a/util_liveinfo/src/node.c
+++ b/util_liveinfo/src/node.c
@@ -257,18 +257,28 @@ void node_delete(struct node *node, void (del_cb)(struct node *node))
        if (node->sibling.next)
                node->sibling.next->sibling.prev = node->sibling.prev;
 
+       /* Isolate the node */
+       node->sibling.prev = NULL;
+       node->sibling.next = NULL;
+
        if (node->parent) {
-               node->parent->child = NULL;
+               if (node->parent->child == node)
+                       node->parent->child = NULL;
+
                node->parent = NULL;
        }
 
        tmp = node;
        while (tmp) {
+               /* Reach to the leaf node */
                while (tmp->child) tmp = tmp->child;
 
                parent = tmp->parent;
                next = tmp->sibling.next;
 
+               if (parent && parent->child == tmp)
+                       parent->child = NULL;
+
                if (del_cb)
                        del_cb(tmp);