From cad123d9ea08aea7a11df4abdcf6794a09185328 Mon Sep 17 00:00:00 2001
From: APriestman <apriestman@basistech.com>
Date: Thu, 23 Apr 2015 13:29:20 -0400
Subject: [PATCH] Clear out Image Gallery thumbnail cache to prevent images
 from closed cases from being re-used.

---
 .../autopsy/imagegallery/ImageGalleryController.java       | 2 ++
 .../org/sleuthkit/autopsy/imagegallery/ThumbnailCache.java | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
index 40f0779f7f..ac6b844c3e 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryController.java
@@ -347,6 +347,8 @@ public final class ImageGalleryController {
     public synchronized void reset() {
         LOGGER.info("resetting ImageGalleryControler to initial state.");
         selectionModel.clearSelection();
+        setListeningEnabled(false);
+        ThumbnailCache.getDefault().clearCache();
         Platform.runLater(() -> {
             historyManager.clear();
         });
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ThumbnailCache.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ThumbnailCache.java
index 0aab44e58c..ee7c74e981 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ThumbnailCache.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ThumbnailCache.java
@@ -83,6 +83,13 @@ public enum ThumbnailCache {
     /** thread that saves generated thumbnails to disk for use later */
     private final Executor imageSaver = Executors.newSingleThreadExecutor(new BasicThreadFactory.Builder().namingPattern("icon saver-%d").build());
 
+    /**
+     * Clear out the cache between cases
+     */
+    public final void clearCache() {
+        cache.invalidateAll();
+    }
+    
     /** get the cached thumbnail for the given file or generate a new one if
      * needed
      *