cli: sort `nmcli device` output by active-connection first

Previously, we first sort by the device's state, then by the active
connection's state. Contrast to `nmcli connection`, which first sorts
by the active connection's state.

It means, the sort order is somewhat different. Fix that.

In most cases, that shouldn't make a difference, because the
device's state and the active-connection's state should
correspond. However, it matters as we now treat external activations
different, and that is tied to the active connection.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/nmcli/devices.c b/src/nmcli/devices.c
index 40ef536e14..a3ea7c454f 100644
--- a/src/nmcli/devices.c
+++ b/src/nmcli/devices.c
@@ -1082,8 +1082,8 @@ compare_devices(const void *a, const void *b)
     NMActiveConnection *da_ac = nm_device_get_active_connection(da);
     NMActiveConnection *db_ac = nm_device_get_active_connection(db);
 
-    NM_CMP_DIRECT(nm_device_get_state(db), nm_device_get_state(da));
     NM_CMP_RETURN(nmc_active_connection_cmp(db_ac, da_ac));
+    NM_CMP_DIRECT(nm_device_get_state(db), nm_device_get_state(da));
     NM_CMP_DIRECT_STRCMP0(nm_device_get_type_description(da), nm_device_get_type_description(db));
     NM_CMP_DIRECT_STRCMP0(nm_device_get_iface(da), nm_device_get_iface(db));
     NM_CMP_DIRECT_STRCMP0(nm_object_get_path(NM_OBJECT(da)), nm_object_get_path(NM_OBJECT(db)));