summaryrefslogtreecommitdiff
path: root/src
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 15:09:55 +0200
commit21c98f5da9b18764819669a2635ab674e912b14b (patch)
treea899b97ddec02e9a71ed2cbeb491531a9bebc0a9 /src
parent5476ea5c452a67c0ec12a94d26a1e8321c6a1b6b (diff)
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. (cherry picked from commit ec542df4dff731db45df960e60c6fab12b69760f)
Diffstat (limited to 'src')
-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 467b45d7d5..082b7ef908 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -731,6 +731,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);