From ecfba49a35ff8f3e9c50204f757e7add85ed8ed9 Mon Sep 17 00:00:00 2001
From: Kelly Kelly <kelly@basistech.com>
Date: Wed, 5 Jan 2022 14:05:37 -0500
Subject: [PATCH] Fixed IllegalStateException

---
 .../autopsy/directorytree/FileSearchTreeAction.java         | 6 +++++-
 .../org/sleuthkit/autopsy/filesearch/FileSearchAction.java  | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/FileSearchTreeAction.java b/Core/src/org/sleuthkit/autopsy/directorytree/FileSearchTreeAction.java
index 90a3a2f02c..76ab9e6f7f 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/FileSearchTreeAction.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/FileSearchTreeAction.java
@@ -28,6 +28,7 @@ import org.sleuthkit.autopsy.filesearch.FileSearchAction;
 public class FileSearchTreeAction extends AbstractAction {
 
     private final long dataSourceId;
+    private FileSearchAction searcher; 
 
     /**
      * Main constructor.
@@ -43,7 +44,10 @@ public class FileSearchTreeAction extends AbstractAction {
 
     @Override
     public void actionPerformed(ActionEvent e) {
-        FileSearchAction searcher = new FileSearchAction();
+        if(searcher == null) {
+            searcher = FileSearchAction.getDefault();
+        }
+        
         searcher.showDialog(dataSourceId);
     }
 
diff --git a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
index 38a9db7068..1e271492c8 100644
--- a/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
+++ b/Core/src/org/sleuthkit/autopsy/filesearch/FileSearchAction.java
@@ -25,6 +25,7 @@ import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.timeline.OpenTimelineAction;
 
 final public class FileSearchAction extends CallableSystemAction {
 
@@ -33,7 +34,7 @@ final public class FileSearchAction extends CallableSystemAction {
     private static FileSearchDialog searchDialog;
     private static Long selectedDataSourceId;
 
-    public FileSearchAction() {
+    private FileSearchAction() {
         super();
         setEnabled(Case.isCaseOpen());
         Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE), (PropertyChangeEvent evt) -> {
@@ -48,7 +49,7 @@ final public class FileSearchAction extends CallableSystemAction {
 
     public static FileSearchAction getDefault() {
         if (instance == null) {
-            instance = new FileSearchAction();
+            instance = CallableSystemAction.get(FileSearchAction.class);
         }
         return instance;
     }