From 0d27c7ee1db66bc6d06a9ae6a89536ec85eee88e Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Fri, 20 Dec 2019 13:47:31 +0100 Subject: [PATCH] monitor: Make the connector the last sort key for monitors We want to ignore the connector in certain situations. Prepare this by changing the sort order so that two monitors will be paired up in the list if only the connector is different. https://gitlab.gnome.org/GNOME/mutter/issues/932 --- src/backends/meta-monitor.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/backends/meta-monitor.c b/src/backends/meta-monitor.c index 2b0aa5ac6..5d163e1a8 100644 --- a/src/backends/meta-monitor.c +++ b/src/backends/meta-monitor.c @@ -140,10 +140,6 @@ meta_monitor_spec_compare (MetaMonitorSpec *monitor_spec_a, { int ret; - ret = strcmp (monitor_spec_a->connector, monitor_spec_b->connector); - if (ret != 0) - return ret; - ret = strcmp (monitor_spec_a->vendor, monitor_spec_b->vendor); if (ret != 0) return ret; @@ -152,7 +148,15 @@ meta_monitor_spec_compare (MetaMonitorSpec *monitor_spec_a, if (ret != 0) return ret; - return strcmp (monitor_spec_a->serial, monitor_spec_b->serial); + ret = strcmp (monitor_spec_a->serial, monitor_spec_b->serial); + if (ret != 0) + return ret; + + ret = strcmp (monitor_spec_a->connector, monitor_spec_b->connector); + if (ret != 0) + return ret; + + return 0; } void