diff options
author | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-09-03 14:17:15 +0300 |
---|---|---|
committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2012-09-04 12:09:23 +0300 |
commit | 5891f4e0434017bfdb51e61a57ea077e14676149 (patch) | |
tree | d7fb0aefec519b886755fd40140bb373b67bb888 /src/agent.c | |
parent | ab0b83fe24b451e26ee8c26d201ca300946097f0 (diff) | |
download | connman-5891f4e0434017bfdb51e61a57ea077e14676149.tar.gz connman-5891f4e0434017bfdb51e61a57ea077e14676149.tar.bz2 connman-5891f4e0434017bfdb51e61a57ea077e14676149.zip |
agent: Always clean up and unref on agent shutdown
Diffstat (limited to 'src/agent.c')
-rw-r--r-- | src/agent.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/agent.c b/src/agent.c index aff41dfe..db5ea136 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); } |