From 9c928c17d5ff3fea1ec4e7c700aaf00257696f9e Mon Sep 17 00:00:00 2001
From: Richard Cordovano <rcordovano@basistech.com>
Date: Tue, 8 Apr 2014 16:10:54 -0400
Subject: [PATCH] Fixed bug in DataSourceIngestPipeline

---
 .../sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
index 2a135d4c96..bac11238b5 100755
--- a/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestPipeline.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.netbeans.api.progress.ProgressHandle;
 import org.sleuthkit.datamodel.Content;
 
 /**
@@ -84,6 +83,9 @@ final class DataSourceIngestPipeline {
             } catch (Exception ex) {
                 errors.add(new IngestModuleError(module.getDisplayName(), ex));
             }
+            if (job.isCancelled()) {
+                break;
+            }
         }
         return errors;
     }
@@ -96,9 +98,6 @@ final class DataSourceIngestPipeline {
             } catch (Exception ex) {
                 errors.add(new IngestModuleError(module.getDisplayName(), ex));
             }
-            if (job.isCancelled()) {
-                break;
-            }
         }
         return errors;
     }