mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-08 22:29:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

1066: Grouping by Camera Make/Model depends on data source selection, despite being told otherwise

Browse Source
This commit is contained in:
Raman 2018-10-11 13:22:01 -04:00
parent 09def81220
commit aee36df5ea
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java
View File

@ -449,7 +449,7 @@ public class GroupManager {
* *
* @param dataSource Data source to display or null to display all of them * @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); dataSourceProp.set(dataSource);
} }

3
ImageGallery/src/org/sleuthkit/autopsy/imagegallery/gui/Toolbar.java
View File

@ -185,6 +185,9 @@ public class Toolbar extends ToolBar {
alert.initOwner(getScene().getWindow()); alert.initOwner(getScene().getWindow());
GuiUtils.setDialogIcons(alert); GuiUtils.setDialogIcons(alert);
if (alert.showAndWait().orElse(ButtonType.CANCEL) == ButtonType.OK) { if (alert.showAndWait().orElse(ButtonType.CANCEL) == ButtonType.OK) {
// Set the datasource selection to 'All', before switching group
controller.getGroupManager().setDataSource(null);
queryInvalidationListener.invalidated(observable); queryInvalidationListener.invalidated(observable);
} else { } else {
Platform.runLater(() -> groupByBox.getSelectionModel().select(DrawableAttribute.PATH)); Platform.runLater(() -> groupByBox.getSelectionModel().select(DrawableAttribute.PATH));