From f2155f3aa71201f54a15dfc818e2d37ae8c5c56c Mon Sep 17 00:00:00 2001 From: adam-m Date: Fri, 30 Nov 2012 17:49:57 -0500 Subject: [PATCH] Case closing: close top components before sending out events when case is changed, for a cleaner shutdown --- Core/src/org/sleuthkit/autopsy/casemodule/Case.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java index 5d389844b4..02b31d6a6e 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java @@ -173,11 +173,13 @@ public class Case { String oldCaseName = oldCase != null ? oldCase.name : ""; + doCaseChange(null); //closes windows, etc pcs.firePropertyChange(CASE_CURRENT_CASE, oldCase, null); - doCaseChange(null); + - pcs.firePropertyChange(CASE_NAME, oldCaseName, ""); doCaseNameChange(""); + pcs.firePropertyChange(CASE_NAME, oldCaseName, ""); + @@ -827,14 +829,16 @@ public class Case { Case.runAddImageAction(); } } else { // case is closed + // close all top components first + CoreComponentControl.closeCoreWindows(); + // disable these menus CallableSystemAction.get(AddImageAction.class).setEnabled(false); // Add Image menu CallableSystemAction.get(CaseCloseAction.class).setEnabled(false); // Case Close menu CallableSystemAction.get(CasePropertiesAction.class).setEnabled(false); // Case Properties menu CallableSystemAction.get(CaseDeleteAction.class).setEnabled(false); // Delete Case menu - // close all top components - CoreComponentControl.closeCoreWindows(); + Frame f = WindowManager.getDefault().getMainWindow(); f.setTitle(Case.getAppName()); // set the window name to just application name