From eb7599c7afad23dd977a63f6c08fd282b4c09d32 Mon Sep 17 00:00:00 2001 From: adam-m Date: Wed, 22 Aug 2012 16:34:23 -0400 Subject: [PATCH] better check to active widgets --- .../keywordsearch/KeywordSearchConfigurationPanel2.java | 3 ++- .../keywordsearch/KeywordSearchConfigurationPanel3.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java index 3bcff37460..2696d70436 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel2.java @@ -61,7 +61,8 @@ public class KeywordSearchConfigurationPanel2 extends javax.swing.JPanel { private void activateWidgets() { final KeywordSearchIngestService service = KeywordSearchIngestService.getDefault(); skipNSRLCheckBox.setSelected(service.getSkipKnown()); - boolean enable = !IngestManager.getDefault().isIngestRunning(); + boolean enable = !IngestManager.getDefault().isIngestRunning() + && ! IngestManager.getDefault().isServiceRunning(KeywordSearchIngestService.getDefault()); skipNSRLCheckBox.setEnabled(enable); } diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java index 9563729de7..f74cc9384d 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchConfigurationPanel3.java @@ -117,7 +117,8 @@ public class KeywordSearchConfigurationPanel3 extends javax.swing.JPanel { private void activateWidgets() { reloadScriptsCheckBoxes(); - boolean enable = !IngestManager.getDefault().isIngestRunning(); + boolean enable = !IngestManager.getDefault().isIngestRunning() + && ! IngestManager.getDefault().isServiceRunning(KeywordSearchIngestService.getDefault());; //enable / disable checboxes activateScriptsCheckboxes(enable); }