From 4e78c40afa7ea9bb77e87c445777eba7c47a58d4 Mon Sep 17 00:00:00 2001
From: millmanorama <millmanorama@gmail.com>
Date: Wed, 19 Sep 2018 14:21:28 +0200
Subject: [PATCH] use the order reversed property in GroupComparators to
 correct the used comparator.

---
 .../autopsy/imagegallery/gui/navpanel/GroupComparators.java | 4 ++++
 .../autopsy/imagegallery/gui/navpanel/NavPanel.java         | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupComparators.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupComparators.java
index 16ac00d0a2..52b5ffc525 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupComparators.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/GroupComparators.java
@@ -56,6 +56,10 @@ final class GroupComparators<T extends Comparable<T>> implements Comparator<Draw
     private final Function<DrawableGroup, T> extractor;
     private final Function<T, String> valueFormatter;
     private final boolean orderReveresed;
+
+     boolean isOrderReveresed() {
+        return orderReveresed;
+    }
     private final String displayName;
 
     private GroupComparators(String displayName, Function<DrawableGroup, T> extractor, Function<T, String> formatter, boolean defaultOrderReversed) {
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
index e8c97c1379..46131cb4e5 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/navpanel/NavPanel.java
@@ -123,10 +123,12 @@ abstract class NavPanel<X> extends Tab {
      */
     @ThreadConfined(type = ThreadConfined.ThreadType.JFX)
     Comparator<DrawableGroup> getComparator() {
-        Comparator<DrawableGroup> comparator = sortChooser.getComparator();
-        return (sortChooser.getSortOrder() == SortOrder.ASCENDING)
+        GroupComparators<?> comparator = sortChooser.getComparator();
+        Comparator<DrawableGroup> comparator2 = (sortChooser.getSortOrder() == SortOrder.ASCENDING)
                 ? comparator
                 : comparator.reversed();
+
+        return comparator.isOrderReveresed() ? comparator2.reversed() : comparator2;
     }
 
     /**