libnm: Don't expect VPN connections to attach to the device

75f767ca · Lubomir Rintel · 282d9b0e · 75f767ca
Commit 75f767ca authored Nov 09, 2014 by Lubomir Rintel 🥕
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

libnm/nm-manager.c libnm/nm-manager.c +6 -3

No files found.
--- 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;