From f77b48a59afd70698c4ad864a42f356f698ceedc Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 8 Nov 2017 11:42:50 +0100 Subject: [PATCH] device: minor refactoring of condition in nm_device_autoconnect_allowed() Makes it clearer what is happening (to me). (cherry picked from commit 45da11f37068059df5d36115d80bebd15fc92188) --- src/devices/nm-device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 4692590b9..1dd24fe8f 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -4307,9 +4307,12 @@ nm_device_autoconnect_allowed (NMDevice *self) if (!nm_device_get_enabled (self)) return FALSE; - /* Unrealized devices can always autoconnect. */ - if (nm_device_is_real (self) && priv->state < NM_DEVICE_STATE_DISCONNECTED) - return FALSE; + if (nm_device_is_real (self)) { + if (priv->state < NM_DEVICE_STATE_DISCONNECTED) + return FALSE; + } else { + /* Unrealized devices can always autoconnect. */ + } /* The 'autoconnect-allowed' signal is emitted on a device to allow * other listeners to block autoconnect on the device if they wish.