summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/devices/nm-device.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index c1c2774d6a..9c4b2288b2 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -6023,6 +6023,9 @@ nm_device_autoconnect_allowed (NMDevice *self)
return FALSE;
}
+ if (priv->delete_on_deactivate_data)
+ return FALSE;
+
/* The 'autoconnect-allowed' signal is emitted on a device to allow
* other listeners to block autoconnect on the device if they wish.
* This is mainly used by the OLPC Mesh devices to block autoconnect
@@ -12058,6 +12061,8 @@ delete_on_deactivate_link_delete (gpointer user_data)
} else if (data->ifindex > 0)
nm_platform_link_delete (nm_device_get_platform (self), data->ifindex);
+ nm_device_emit_recheck_auto_activate (self);
+
g_free (data);
return FALSE;
}