Issue 1987: improved DCP support; Issue 2042: batch queue crash fix

2013-11-19 08:37:42 +01:00
parent 047fd34e4e
commit 114f7e4531
21 changed files with 824 additions and 305 deletions
--- a/rtengine/simpleprocess.cc
+++ b/rtengine/simpleprocess.cc
@@ -681,9 +681,17 @@ void batchProcessingThread (ProcessingJob* job, BatchProcessingListener* bpl, bo
    while (currentJob) {
        int errorCode;
        IImage16* img = processImage (currentJob, errorCode, bpl, tunnelMetaData);
-        if (errorCode) 
+        if (errorCode) {
            bpl->error ("Can not load input image.");
-        currentJob = bpl->imageReady (img);
+            currentJob = NULL;
+        } else {
+            try {
+                currentJob = bpl->imageReady (img);
+            } catch (Glib::Exception& ex) {
+                bpl->error (ex.what());
+                currentJob = NULL;
+            }
+        }
    }
 }