From 17b36159766108deee6cd420e48c7ff3f700c5af Mon Sep 17 00:00:00 2001
From: Sophie Mori <smori@basistech.com>
Date: Mon, 7 Nov 2016 13:33:23 -0500
Subject: [PATCH] Fix race condition between report completion and GUI state

---
 Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java     | 2 ++
 .../src/org/sleuthkit/autopsy/report/TableReportGenerator.java | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
index 6ed903c7b2..6f32fd2f65 100644
--- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
@@ -170,6 +170,8 @@ class ReportGenerator {
                 TableReportGenerator generator = new TableReportGenerator(artifactTypeSelections, tagNameSelections, progressPanel, tableReport);
                 generator.execute();
                 tableReport.endReport();
+                // finish progress, wrap up
+                progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
                 errorList = generator.getErrorList();
             });
             worker.execute();
diff --git a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
index f4afd1bd1e..d3a782948c 100755
--- a/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
+++ b/Core/src/org/sleuthkit/autopsy/report/TableReportGenerator.java
@@ -114,9 +114,6 @@ class TableReportGenerator {
             // report on the tagged images
             makeThumbnailTable();
         }
-
-        // finish progress, wrap up
-        progressPanel.complete(ReportProgressPanel.ReportStatus.COMPLETE);
     }
 
     /**