Fix corner case in monitor index calculation

Fix a bug in the comparison function that could result in the wrong
index being assigned to a monitor. Change the logic to more directly map
to the description.

(cherry picked from commit 72d632673ba4531132fd1cd59c2d0b9966551300)

diff --git a/vncviewer/MonitorIndicesParameter.cxx b/vncviewer/MonitorIndicesParameter.cxx
index ad791504bd06fe561deb8e6157afa4d7683c6c6c..5130831cb4a8e221c7fb6884c37a27b355e4a6b4 100644 (file)
--- a/vncviewer/MonitorIndicesParameter.cxx
+++ b/vncviewer/MonitorIndicesParameter.cxx
@@ -243,12 +243,14 @@ int MonitorIndicesParameter::compare(const void *a, const void *b)
     if (monitor1->x < monitor2->x)
         return -1;
 
+    if (monitor1->x > monitor2->x)
+        return 1;
+
     if (monitor1->y < monitor2->y)
         return -1;
 
-    if (monitor1->x == monitor2->x)
-        if (monitor1->y == monitor2->y)
-            return 0;
+    if (monitor1->y > monitor2->y)
+        return 1;
 
-    return 1;
+    return 0;
 }