Merge pull request #800 from g-maxime/compare-order

Cocoa GUI: Fix unsorted streams in compare view
MediaArea · Feb 12, 2024 · 45aa301 · 45aa301
2 parents 2785946 + 69c24da
commit 45aa301
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/Source/GUI/Cocoa/CompareView.m b/Source/GUI/Cocoa/CompareView.m
@@ -235,9 +235,17 @@ -(id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)
             }
         }
     }
-    else {
-        if (index < [_fields count])
-            return [[_fields allKeys] objectAtIndex: index];
+    else if (index < [_fields count]) {
+        return  [[[_fields allKeys] sortedArrayUsingComparator:^NSComparisonResult(id first, id second) {
+            if ([first[@"kind"] isLessThan: second[@"kind"]] || ([first[@"kind"] isEqualTo: second[@"kind"]] && [first[@"number"] isLessThan: second[@"number"]])) {
+                return NSOrderedAscending;
+            }
+            if ([first[@"kind"] isGreaterThan: second[@"kind"]] || ([first[@"kind"] isEqualTo: second[@"kind"]] && [first[@"number"] isGreaterThan: second[@"number"]])) {
+                return NSOrderedDescending;
+            }
+
+            return NSOrderedSame;
+        }] objectAtIndex:index];
     }
 
     return nil;