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

Merge branch 'master' of https://github.com/sleuthkit/autopsy

Browse Source
This commit is contained in:
adam-m 2012-01-18 16:21:52 -05:00
commit 3cd083a326
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Case/src/org/sleuthkit/autopsy/casemodule/AddImageWizardPanel3.java
View File

@ -203,6 +203,7 @@ class AddImageWizardPanel3 implements WizardDescriptor.Panel<WizardDescriptor> {
// task
AddImageAction.CleanupTask cleanupImage = (AddImageAction.CleanupTask) settings.getProperty(AddImageAction.IMAGECLEANUPTASK_PROP);
cleanupImage.disable();
settings.putProperty(AddImageAction.IMAGECLEANUPTASK_PROP, null);
}
}
}

2
FileSearch/src/org/sleuthkit/autopsy/filesearch/FileSearchTopComponent.java
View File

@ -167,8 +167,10 @@ public final class FileSearchTopComponent extends TopComponent implements DataEx
SleuthkitCase tempDb = currentCase.getSleuthkitCase();
ResultSet rs = tempDb.runQuery(this.getQuery("count(*) as TotalMatches"));
totalMatches = totalMatches + rs.getInt("TotalMatches");
rs.close();
rs = tempDb.runQuery(this.getQuery(null));
currentDbList = tempDb.resultSetToFsContents(rs);
rs.close();
fsContentList.addAll(currentDbList);
} catch (SQLException ex) {
Logger logger = Logger.getLogger(this.getClass().getName());