From 28a706efde992e6c023c0c3e18d457d677ea3d09 Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Tue, 4 Apr 2017 14:30:42 -0400 Subject: [PATCH] 2518 corrected a couple comments to reflect when ingest is actually started now --- .../casemodule/AddImageWizardAddingProgressPanel.java | 1 + .../casemodule/AddImageWizardIngestConfigPanel.java | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java index a8d803c80b..fad2b807ef 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardAddingProgressPanel.java @@ -236,6 +236,7 @@ class AddImageWizardAddingProgressPanel extends ShortcutWizardDescriptorPanel { */ @Override public void readSettings(WizardDescriptor settings) { + // Start ingest if it hasn't already been started startIngest(); settings.setOptions(new Object[]{WizardDescriptor.PREVIOUS_OPTION, WizardDescriptor.NEXT_OPTION, WizardDescriptor.FINISH_OPTION, WizardDescriptor.CANCEL_OPTION}); if (imgAdded) { diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java index ede2bf2c38..2dad6784c3 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java @@ -159,10 +159,8 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel { @Override public void storeSettings(WizardDescriptor settings) { IngestJobSettings ingestJobSettings = ingestJobSettingsPanel.getSettings(); - ingestJobSettings.save(); - - // Start ingest if it hasn't already been started - progressPanel.setIngestJobSettings(ingestJobSettings); //calls start Ingest + ingestJobSettings.save(); + progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started } private static void showWarnings(IngestJobSettings ingestJobSettings) { @@ -189,8 +187,7 @@ class AddImageWizardIngestConfigPanel extends ShortcutWizardDescriptorPanel { } //Because this panel kicks off ingest during the wizard we need to //swap out the ingestJobSettings for the ones of the chosen profile before - //we start processing IngestJobSettings ingestJobSettings = new IngestJobSettings(lastProfileUsed); - progressPanel.setIngestJobSettings(ingestJobSettings); //calls start ingest + progressPanel.setIngestJobSettings(ingestJobSettings); //prepare ingest for being started } }