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

Move ingest job cancellation into Case class

Browse Source
This commit is contained in:
Richard Cordovano 2015-10-26 15:31:02 -04:00
parent fc313f15ad
commit d6543dd967
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -73,6 +73,7 @@ import org.sleuthkit.autopsy.casemodule.events.ContentTagAddedEvent;
import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent; import org.sleuthkit.autopsy.casemodule.events.ContentTagDeletedEvent;
import org.sleuthkit.autopsy.core.RuntimeProperties; import org.sleuthkit.autopsy.core.RuntimeProperties;
import org.sleuthkit.autopsy.core.UserPreferencesException; import org.sleuthkit.autopsy.core.UserPreferencesException;
import org.sleuthkit.autopsy.ingest.IngestManager;
import org.sleuthkit.datamodel.BlackboardArtifactTag; import org.sleuthkit.datamodel.BlackboardArtifactTag;
import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.ContentTag; import org.sleuthkit.datamodel.ContentTag;
@ -326,6 +327,7 @@ public class Case implements SleuthkitCase.ErrorObserver {
SwingUtilities.invokeLater(() -> { SwingUtilities.invokeLater(() -> {
WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); WindowManager.getDefault().getMainWindow().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
}); });
IngestManager.getInstance().cancelAllIngestJobs();
doCaseChange(null); //closes windows, etc doCaseChange(null); //closes windows, etc
if (null != oldCase.tskErrorReporter) { if (null != oldCase.tskErrorReporter) {
oldCase.tskErrorReporter.shutdown(); // stop listening for TSK errors for the old case oldCase.tskErrorReporter.shutdown(); // stop listening for TSK errors for the old case

1
Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -396,7 +396,6 @@ public class IngestManager {
jobEventPublisher.closeRemoteEventChannel(); jobEventPublisher.closeRemoteEventChannel();
moduleEventPublisher.closeRemoteEventChannel(); moduleEventPublisher.closeRemoteEventChannel();
this.jobCreationIsEnabled = false; this.jobCreationIsEnabled = false;
cancelAllIngestJobs();
clearIngestMessageBox(); clearIngestMessageBox();
} }