summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-04-01 14:35:38 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-04-01 14:35:38 +0200
commitec542df4dff731db45df960e60c6fab12b69760f (patch)
tree28bb16e2e97fbc1b3333f5d765f90837424b765b
parent1ab89ecf852d7f13536da9aa04c571140a50e0fd (diff)
downloadNetworkManager-ec542df4dff731db45df960e60c6fab12b69760f.tar.gz
manager: don't the already activated devices shouldn't be considered added
The NMSettings shouldn't generate a new default wired connection for devices that are being deactivated.
-rw-r--r--src/nm-manager.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 1694b4324f..336b492737 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -762,6 +762,9 @@ manager_device_state_changed (NMDevice *device,
break;
}
+ if (old_state >= NM_DEVICE_STATE_ACTIVATED)
+ return;
+
if ( new_state == NM_DEVICE_STATE_UNAVAILABLE
|| new_state == NM_DEVICE_STATE_DISCONNECTED)
nm_settings_device_added (priv->settings, device);