diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-11-09 14:09:40 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2014-11-19 19:51:44 +0100 |
| commit | 75f767ca23587951f20a8ad953d59b4bb5a66bf8 (patch) | |
| tree | 8581dfa09e03385a5ed8d7640f07ac5e947403c1 | |
| parent | 282d9b0e10c08dcda4a1d082b15dc2bdda8ee3d2 (diff) | |
| download | NetworkManager-75f767ca23587951f20a8ad953d59b4bb5a66bf8.tar.gz | |
libnm: Don't expect VPN connections to attach to the device
| -rw-r--r-- | libnm/nm-manager.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c index bbb9331305..3c5903b6da 100644 --- a/libnm/nm-manager.c +++ b/libnm/nm-manager.c @@ -818,9 +818,12 @@ recheck_pending_activations (NMManager *self) devices = nm_active_connection_get_devices (candidate); if (devices->len == 0) continue; - device = devices->pdata[0]; - if (nm_device_get_active_connection (device) != candidate) - continue; + + if (!NM_IS_VPN_CONNECTION (candidate)) { + device = devices->pdata[0]; + if (nm_device_get_active_connection (device) != candidate) + continue; + } activate_info_complete (info, candidate, NULL); break; |