From 503e1e56ef760157fc3ce67743c9f3436d0ecb87 Mon Sep 17 00:00:00 2001
From: Raman <raman@basistech.com>
Date: Tue, 13 Nov 2018 18:40:40 -0500
Subject: [PATCH] Manually applied changes to resolve merge conflict - Push
isImageGalleryOpen() check on EDT.
---
.../imagegallery/ImageGalleryModule.java | 28 ++++++++++---------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
index 8386999c69..2dd4ba2362 100644
--- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
+++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryModule.java
@@ -364,21 +364,23 @@ public void propertyChange(PropertyChangeEvent evt) {
// A remote node added a new data source and just finished ingest on it.
//drawable db is stale, and if ImageGallery is open, ask user what to do
controller.setStale(true);
- if (controller.isListeningEnabled() && ImageGalleryTopComponent.isImageGalleryOpen()) {
+ if (controller.isListeningEnabled()) {
SwingUtilities.invokeLater(() -> {
- int showAnswer = JOptionPane.showConfirmDialog(ImageGalleryTopComponent.getTopComponent(),
- Bundle.ImageGalleryController_dataSourceAnalyzed_confDlg_msg(),
- Bundle.ImageGalleryController_dataSourceAnalyzed_confDlg_title(),
- JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
+ if (ImageGalleryTopComponent.isImageGalleryOpen()) {
+ int showAnswer = JOptionPane.showConfirmDialog(ImageGalleryTopComponent.getTopComponent(),
+ Bundle.ImageGalleryController_dataSourceAnalyzed_confDlg_msg(),
+ Bundle.ImageGalleryController_dataSourceAnalyzed_confDlg_title(),
+ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);
- switch (showAnswer) {
- case JOptionPane.YES_OPTION:
- controller.rebuildDB();
- break;
- case JOptionPane.NO_OPTION:
- case JOptionPane.CANCEL_OPTION:
- default:
- break; //do nothing
+ switch (showAnswer) {
+ case JOptionPane.YES_OPTION:
+ controller.rebuildDB();
+ break;
+ case JOptionPane.NO_OPTION:
+ case JOptionPane.CANCEL_OPTION:
+ default:
+ break; //do nothing
+ }
}
});
}
--
GitLab