From 7efb49e571b228f9c4ef55449cf03ab0f7fdf638 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 26 Dec 2008 22:53:11 +0100 Subject: [PATCH] Unlink node before calling remove callback --- src/element.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/element.c b/src/element.c index a690046..fbc5cc9 100644 --- a/src/element.c +++ b/src/element.c @@ -1783,6 +1783,9 @@ static gboolean remove_element(GNode *node, gpointer user_data) if (element == root) return FALSE; + if (node != NULL) + g_node_unlink(node); + if (element->driver) { disable_element(element); @@ -1794,10 +1797,8 @@ static gboolean remove_element(GNode *node, gpointer user_data) __connman_element_unlock(element); } - if (node != NULL) { - g_node_unlink(node); + if (node != NULL) g_node_destroy(node); - } if (element->type == CONNMAN_ELEMENT_TYPE_CONNECTION) { if (__connman_element_count(NULL, -- 2.7.4