From 5891f4e0434017bfdb51e61a57ea077e14676149 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Mon, 3 Sep 2012 14:17:15 +0300 Subject: [PATCH] agent: Always clean up and unref on agent shutdown --- src/agent.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/agent.c b/src/agent.c index aff41df..db5ea13 100644 --- a/src/agent.c +++ b/src/agent.c @@ -957,19 +957,16 @@ void __connman_agent_cleanup(void) if (agent_watch > 0) g_dbus_remove_watch(connection, agent_watch); - if (agent_path == NULL) - return; - - message = dbus_message_new_method_call(agent_sender, agent_path, - CONNMAN_AGENT_INTERFACE, "Release"); - if (message == NULL) - return; - - dbus_message_set_no_reply(message, TRUE); - - g_dbus_send_message(connection, message); + if (agent_path != NULL) { + message = dbus_message_new_method_call(agent_sender, agent_path, + CONNMAN_AGENT_INTERFACE, "Release"); + if (message != NULL) { + dbus_message_set_no_reply(message, TRUE); + g_dbus_send_message(connection, message); + } - agent_free(); + agent_free(); + } dbus_connection_unref(connection); } -- 2.7.4