From 2e8a2921e5ae7bb12dbed9e94311203292ddc9a9 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 24 Sep 2014 09:40:14 +0200 Subject: [PATCH] core: ensure properly comparing boolean values in connection_sort() Signed-off-by: Thomas Haller --- src/settings/nm-settings.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index 096608ce05..5a7bf4159e 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -326,17 +326,17 @@ connection_sort (gconstpointer pa, gconstpointer pb) NMConnection *b = NM_CONNECTION (pb); NMSettingConnection *con_b; guint64 ts_a = 0, ts_b = 0; + gboolean can_ac_a, can_ac_b; con_a = nm_connection_get_setting_connection (a); g_assert (con_a); con_b = nm_connection_get_setting_connection (b); g_assert (con_b); - if (nm_setting_connection_get_autoconnect (con_a) != nm_setting_connection_get_autoconnect (con_b)) { - if (nm_setting_connection_get_autoconnect (con_a)) - return -1; - return 1; - } + can_ac_a = !!nm_setting_connection_get_autoconnect (con_a); + can_ac_b = !!nm_setting_connection_get_autoconnect (con_b); + if (can_ac_a != can_ac_b) + return can_ac_a ? -1 : 1; nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pa), &ts_a); nm_settings_connection_get_timestamp (NM_SETTINGS_CONNECTION (pb), &ts_b);