From aee36df5eae1431e7ea6fc6dc46e445ac38cde7c Mon Sep 17 00:00:00 2001 From: Raman Date: Thu, 11 Oct 2018 13:22:01 -0400 Subject: [PATCH] 1066: Grouping by Camera Make/Model depends on data source selection, despite being told otherwise --- .../autopsy/imagegallery/datamodel/grouping/GroupManager.java | 2 +- .../src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java index 04f5906120..263e189b7d 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java @@ -449,7 +449,7 @@ public class GroupManager { * * @param dataSource Data source to display or null to display all of them */ - synchronized void setDataSource(DataSource dataSource) { + public synchronized void setDataSource(DataSource dataSource) { dataSourceProp.set(dataSource); } diff --git a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java index 6ce152bfdb..bc0f5e5d84 100644 --- a/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java +++ b/ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java @@ -185,6 +185,9 @@ public class Toolbar extends ToolBar { alert.initOwner(getScene().getWindow()); GuiUtils.setDialogIcons(alert); if (alert.showAndWait().orElse(ButtonType.CANCEL) == ButtonType.OK) { + // Set the datasource selection to 'All', before switching group + controller.getGroupManager().setDataSource(null); + queryInvalidationListener.invalidated(observable); } else { Platform.runLater(() -> groupByBox.getSelectionModel().select(DrawableAttribute.PATH));