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

Merge pull request #5991 from gdicristofaro/6485-TimelineControllerIssue

Browse Source 
6485 TimelineController handling events after the case is closed
This commit is contained in:
Richard Cordovano 2020-07-08 15:28:19 -04:00 committed by GitHub
commit d67c0e3b50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/org/sleuthkit/autopsy/timeline/TimeLineController.java
View File

@ -73,6 +73,7 @@ import org.sleuthkit.autopsy.coreutils.History;
import org.sleuthkit.autopsy.coreutils.LoggedTask; import org.sleuthkit.autopsy.coreutils.LoggedTask;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.ThreadConfined; import org.sleuthkit.autopsy.coreutils.ThreadConfined;
import org.sleuthkit.autopsy.coreutils.ThreadUtils;
import org.sleuthkit.autopsy.events.AutopsyEvent; import org.sleuthkit.autopsy.events.AutopsyEvent;
import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestManager;
import org.sleuthkit.autopsy.ingest.ModuleDataEvent; import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
@ -375,17 +376,26 @@ public class TimeLineController {
} }
} }
/** /**
* "Shut down" Timeline. Remove all the case and ingest listers. Close the * Shuts down the task executor in charge of handling case events.
* timeline window. */
void shutDownTimeLineListeners() {
ThreadUtils.shutDownTaskExecutor(executor);
}
/**
* "Shut down" Timeline. Close the timeline window.
*/ */
@ThreadConfined(type = ThreadConfined.ThreadType.AWT) @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
public void shutDownTimeLine() { public void shutDownTimeLineGui() {
if (topComponent != null) { if (topComponent != null) {
topComponent.close(); topComponent.close();
topComponent = null; topComponent = null;
} }
} }
/** /**
* Add the case and ingest listeners, prompt for rebuilding the database if * Add the case and ingest listeners, prompt for rebuilding the database if

3
Core/src/org/sleuthkit/autopsy/timeline/TimeLineModule.java
View File

@ -95,7 +95,8 @@ public class TimeLineModule {
*/ */
synchronized (controllerLock) { synchronized (controllerLock) {
if (controller != null) { if (controller != null) {
SwingUtilities.invokeLater(controller::shutDownTimeLine); controller.shutDownTimeLineListeners();
SwingUtilities.invokeLater(controller::shutDownTimeLineGui);
} }
controller = null; controller = null;
} }