summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-07-17 19:25:53 +0200
committerMarcel Holtmann <marcel@holtmann.org>2009-07-17 19:25:53 +0200
commit7d92c6cde63992f8adc7d767502cb0a9bb1c3e59 (patch)
tree4bf305fa845023407d8859afcc065ac703d58107
parentebae11fb65cf9c198b5f6139acaced5b3e5d4316 (diff)
downloadconnman-7d92c6cde63992f8adc7d767502cb0a9bb1c3e59.tar.gz
connman-7d92c6cde63992f8adc7d767502cb0a9bb1c3e59.tar.bz2
connman-7d92c6cde63992f8adc7d767502cb0a9bb1c3e59.zip
Make sure to always trigger disconnect on users request
-rw-r--r--src/service.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/service.c b/src/service.c
index fc2ff87b..b389b1cf 100644
--- a/src/service.c
+++ b/src/service.c
@@ -626,12 +626,9 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
DBG("service %p", service);
- if (service->pending != NULL) {
+ if (service->pending != NULL)
reply_pending(service, ECONNABORTED);
- return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
- }
-
service->ignore = TRUE;
err = __connman_service_disconnect(service);