From 6d477b42e9e00ef9e18f4616b59a654c33eb194d Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Wed, 22 Mar 2017 16:54:51 -0400
Subject: [PATCH] Truly disable ad hoc keyword search buttons

---
 .../org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java
index 2d19342923..a1ce0a7425 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownToolbar.java
@@ -132,7 +132,7 @@ class DropdownToolbar extends javax.swing.JPanel {
     }
 
     private void maybeShowListsPopup(MouseEvent evt) {
-        if (!active) {
+        if (!active || !listsButton.isEnabled()) {
             return;
         }
         if (evt != null && !SwingUtilities.isLeftMouseButton(evt)) {
@@ -142,7 +142,7 @@ class DropdownToolbar extends javax.swing.JPanel {
     }
 
     private void maybeShowSearchPopup(MouseEvent evt) {
-        if (!active) {
+        if (!active || !searchDropButton.isEnabled()) {
             return;
         }
         if (evt != null && !SwingUtilities.isLeftMouseButton(evt)) {