Changeset 33415 for branches/meh_branches/ppstack_test/ppMerge/src/ppMergeLoop.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeLoop.c (modified) (1 diff)

branches/meh_branches/ppstack_test/ppMerge/src/ppMergeLoop.c

@@ -382 +382 @@
 
             // Wait for the threads to finish and manage results
-            if (!psThreadPoolWait(false)) {
+            if (!psThreadPoolWait(false, true)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to combine images.");
                 return false;