colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

device: minor refactoring of condition in nm_device_autoconnect_allowed()

Browse Source 
Makes it clearer what is happening (to me).

(cherry picked from commit 45da11f370)
This commit is contained in:
Thomas Haller
2017-11-08 11:42:50 +01:00
parent 816adbe89c
commit f77b48a59a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/devices/nm-device.c
View File

@@ -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.