From 54f6666c66f398f3e2a430055cd2f033dd7746ba Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 1 Aug 2014 22:46:49 +0200 Subject: [PATCH] core: recheck_assume_connection() do nothing if the device is not disconnected Signed-off-by: Thomas Haller --- src/nm-manager.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index f32fe01831..eb20ada399 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1652,6 +1652,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; @@ -1665,7 +1666,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,