From e7b44ef4c80907346ec7492a09c45277459924fc Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 19 Aug 2020 10:13:49 +0200 Subject: New upstream version 1.26.2 --- src/nm-active-connection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/nm-active-connection.c') diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 08037ebe..151fb4d9 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -810,14 +810,14 @@ master_state_cb (NMActiveConnection *master, gpointer user_data) { NMActiveConnection *self = NM_ACTIVE_CONNECTION (user_data); + NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (self); NMActiveConnectionState master_state = nm_active_connection_get_state (master); - NMDevice *master_device = nm_active_connection_get_device (master); check_master_ready (self); if ( master_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATING - && (!master_device || !nm_device_is_real (master_device))) { - /* Master failed without ever creating or realizing its device */ + && !priv->master_ready) { + /* Master disconnected before the slave was added */ if (NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed) NM_ACTIVE_CONNECTION_GET_CLASS (self)->master_failed (self); } -- cgit 1.3.0-6-gf8a5