diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-08-01 22:46:49 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-08-22 23:43:10 +0200 |
| commit | b07e3578ba170fa9d161e2b4310ac95ce639fca4 (patch) | |
| tree | 1b84301be31f92bdb7389aed3b266b92c26aea4e | |
| parent | 64305afa1e120688246dbd6eaef71d9be5dfdcb2 (diff) | |
| download | NetworkManager-th/bgo731937_delete_nm_generated_connection.tar.gz | |
core: recheck_assume_connection() do nothing if the device is not disconnectedth/bgo731937_delete_nm_generated_connection
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/nm-manager.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 4d23225039..f249a6d28f 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1712,6 +1712,7 @@ recheck_assume_connection (NMDevice *device, gpointer user_data) NMManager *self = NM_MANAGER (user_data); NMConnection *connection; gboolean was_unmanaged = FALSE, success, generated; + NMDeviceState state; if (manager_sleeping (self)) return FALSE; @@ -1725,7 +1726,12 @@ recheck_assume_connection (NMDevice *device, gpointer user_data) return FALSE; } - if (nm_device_get_state (device) == NM_DEVICE_STATE_UNMANAGED) { + state = nm_device_get_state (device); + + if (state > NM_DEVICE_STATE_DISCONNECTED) + return FALSE; + + if (state == NM_DEVICE_STATE_UNMANAGED) { was_unmanaged = TRUE; nm_device_state_changed (device, NM_DEVICE_STATE_UNAVAILABLE, |