From 6e886bbd119bbcbfb6b2ea01b67f4d095f7abe8e Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Fri, 27 Jan 2012 14:38:35 -0500
Subject: [PATCH] Fix progress reporting with multiple services running

---
 .../autopsy/ingest/IngestManager.java         | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 4e7088c0a4..6167ff6796 100644
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -547,20 +547,20 @@ public class IngestManager {
 
                     try {
                         service.process(unit.content);
-                        //check if new files enqueued
-                        int newImages = getNumImages();
-                        if (newImages > numImages) {
-                            numImages = newImages + processedImages + 1;
-                            progress.switchToIndeterminate();
-                            progress.switchToDeterminate(numImages);
-
-                        }
-                        progress.progress("Images (" + service.getName() + ")", ++processedImages);
-                        --numImages;
                     } catch (Exception e) {
                         logger.log(Level.INFO, "Exception from service: " + service.getName(), e);
                         stats.addError(service);
                     }
+                    //check if new files enqueued
+                    int newImages = getNumImages();
+                    if (newImages > numImages) {
+                        numImages = newImages + processedImages + 1;
+                        progress.switchToIndeterminate();
+                        progress.switchToDeterminate(numImages);
+
+                    }
+                    progress.progress("Images (" + service.getName() + ")", ++processedImages);
+                    --numImages;
                 }
             }
 
@@ -578,21 +578,21 @@ public class IngestManager {
                     }
                     try {
                         service.process(unit.content);
-                        int newFsContents = getNumFsContents();
-                        if (newFsContents > numFsContents) {
-                            //update progress bar if new enqueued
-                            numFsContents = newFsContents + processedFiles + 1;
-                            progress.switchToIndeterminate();
-                            progress.switchToDeterminate(numFsContents);
-
-                        }
-                        progress.progress("Files (" + service.getName() + ")", ++processedFiles);
-                        --numFsContents;
                     } catch (Exception e) {
                         logger.log(Level.INFO, "Exception from service: " + service.getName(), e);
                         stats.addError(service);
                     }
                 }
+                int newFsContents = getNumFsContents();
+                if (newFsContents > numFsContents) {
+                    //update progress bar if new enqueued
+                    numFsContents = newFsContents + processedFiles + 1;
+                    progress.switchToIndeterminate();
+                    progress.switchToDeterminate(numFsContents);
+
+                }
+                progress.progress("Files", ++processedFiles);
+                --numFsContents;
             }
             logger.log(Level.INFO, "Done background processing");
             return null;