From 4460d13d26f6bc23989bec42b1f17b5e7a0398b5 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Thu, 5 Sep 2019 12:09:40 -0400
Subject: [PATCH] 5368 use parent's unique path for grouping by parent path

---
 Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
index 5d269629f8..aa3f6a20d6 100644
--- a/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
+++ b/Core/src/org/sleuthkit/autopsy/filequery/FileSearch.java
@@ -656,11 +656,16 @@ class FileSearch {
      */
     private static class ParentPathGroupKey extends GroupKey {
 
-        private final String parentPath;
+        private String parentPath;
 
         ParentPathGroupKey(ResultFile file) {
             if (file.getFirstInstance().getParentPath() != null) {
-                parentPath = file.getFirstInstance().getParentPath();
+
+                try {
+                    parentPath = file.getFirstInstance().getParent().getUniquePath();
+                } catch (TskCoreException ingored) {
+                    parentPath = file.getFirstInstance().getParentPath();
+                }
             } else {
                 parentPath = ""; // NON-NLS
             }