diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2009-07-07 21:14:00 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2009-07-07 21:14:00 -0700 |
| commit | ef3294d0c9c7841992d594772c4c60948efef731 (patch) | |
| tree | c5441711ead9adf940c7c86ff399269c1fca7a33 | |
| parent | d696ef5626e686368f170ce0d0090af2476b83bc (diff) | |
| download | connman-ef3294d0c9c7841992d594772c4c60948efef731.tar.gz connman-ef3294d0c9c7841992d594772c4c60948efef731.tar.bz2 connman-ef3294d0c9c7841992d594772c4c60948efef731.zip | |
Don't trigger auto-connect if user initiated connect failed
| -rw-r--r-- | src/service.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/service.c b/src/service.c index d5116185..56e4612e 100644 --- a/src/service.c +++ b/src/service.c @@ -471,6 +471,7 @@ static void __connman_service_auto_connect(void) static gboolean connect_timeout(gpointer user_data) { struct connman_service *service = user_data; + connman_bool_t auto_connect = FALSE; DBG("service %p", service); @@ -509,12 +510,14 @@ static gboolean connect_timeout(gpointer user_data) dbus_message_unref(service->pending); service->pending = NULL; - } + } else + auto_connect = TRUE; __connman_service_indicate_state(service, CONNMAN_SERVICE_STATE_FAILURE); - __connman_service_auto_connect(); + if (auto_connect == TRUE) + __connman_service_auto_connect(); return FALSE; } |