diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index d6c4f78bdd..625a6a233b 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -232,7 +232,7 @@ public class ReportGenerator { * Display the progress panels to the user, and add actions to close the * parent dialog. */ - private void displayProgressPanel() { + void displayProgressPanel() { if (reportGenerationPanel == null) { return; } @@ -269,7 +269,6 @@ public class ReportGenerator { String reportDir = createReportDirectory(generalReportModule); setupProgressPanel(generalReportModule, reportDir); generalReportModule.generateReport(reportDir, progressPanel); - displayProgressPanel(); } } @@ -289,7 +288,6 @@ public class ReportGenerator { // finish progress, wrap up progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE); errorList = generator.getErrorList(); - displayProgressPanel(); } } @@ -345,7 +343,6 @@ public class ReportGenerator { fileReportModule.endTable(); fileReportModule.endReport(); progressPanel.complete(ReportStatus.COMPLETE); - displayProgressPanel(); } } @@ -357,7 +354,6 @@ public class ReportGenerator { String reportDir = createReportDirectory(portableCaseReportModule); setupProgressPanel(portableCaseReportModule, reportDir); portableCaseReportModule.generateReport(reportDir, settings, progressPanel); - displayProgressPanel(); } } diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java index 2dc81cab99..331be72b55 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportWizardAction.java @@ -86,12 +86,13 @@ public final class ReportWizardAction extends CallableSystemAction implements Pr if (runReports) { // generate reports in a separate thread + panel = new ReportGenerationPanel(); + ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS ReportWorker worker = new ReportWorker(() -> { - panel = new ReportGenerationPanel(); - ReportGenerator generator = new ReportGenerator(configName, panel); //NON-NLS generator.generateReports(); }); worker.execute(); + generator.displayProgressPanel(); } } }