From 94e2e3117fe7385535ac3c2e3e3faef08562a471 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Mon, 26 Nov 2012 17:31:24 -0500
Subject: [PATCH] better ingest progress bar update if image requeued

---
 .../autopsy/ingest/IngestManager.java         | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 7cbdc545e8..ace60e8594 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -840,25 +840,16 @@ public class IngestManager {
                         stats.addError(module);
                     }
                 }
-                /*
-                int newAbstractFiles = fileScheduler.getFilesEnqueuedEst();
-                if (newAbstractFiles > totalEnqueuedFiles) {
-                    //update progress bar if new enqueued
-                    totalEnqueuedFiles = newAbstractFiles + processedFiles + 1;
+
+                int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
+                if (newTotalEnqueuedFiles > totalEnqueuedFiles) {
+                    //update if new enqueued
+                    totalEnqueuedFiles = newTotalEnqueuedFiles + processedFiles + 1;
                     progress.switchToIndeterminate();
                     progress.switchToDeterminate(totalEnqueuedFiles);
                 }
                 ++processedFiles;
                 --totalEnqueuedFiles;
-                */
-                processedFiles = fileScheduler.getFilesDequeued();
-                int newTotalEnqueuedFiles = fileScheduler.getFilesEnqueuedEst();
-                if (totalEnqueuedFiles != newTotalEnqueuedFiles) {
-                    //update if new enqueued
-                    totalEnqueuedFiles = newTotalEnqueuedFiles;
-                    progress.switchToIndeterminate();
-                    progress.switchToDeterminate(totalEnqueuedFiles);
-                }
                 
             } //end of this AbstractFile
             logger.log(Level.INFO, "Done background processing");