summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2009-05-15 00:53:34 -0700
committerMarcel Holtmann <marcel@holtmann.org>2009-05-15 00:53:34 -0700
commit050811a6aa9fcfe1885e90694eeeebc2ee0fd071 (patch)
tree3ad936825fda2b697db106196b585c546027bf09
parent820d76eb0f2abbf834b88c545fa72aada0829b7e (diff)
downloadconnman-050811a6aa9fcfe1885e90694eeeebc2ee0fd071.tar.gz
connman-050811a6aa9fcfe1885e90694eeeebc2ee0fd071.tar.bz2
connman-050811a6aa9fcfe1885e90694eeeebc2ee0fd071.zip
Disconnect service on removal if still connected
-rw-r--r--src/service.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/service.c b/src/service.c
index 789cc9d7..48bb49c2 100644
--- a/src/service.c
+++ b/src/service.c
@@ -415,15 +415,8 @@ static DBusMessage *remove_service(DBusConnection *conn,
if (service->favorite == FALSE)
return __connman_error_not_supported(msg);
- if (service->network != NULL) {
- struct connman_device *device;
-
- device = connman_network_get_device(service->network);
- if (device != NULL)
- __connman_device_disconnect(device);
-
+ if (service->network != NULL)
__connman_network_disconnect(service->network);
- }
connman_service_set_favorite(service, FALSE);
__connman_storage_save_service(service);