Changeset 33415 for branches/meh_branches/ppstack_test/ppStack/src/ppStackCombineFinal.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)
• ppStack/src/ppStackCombineFinal.c (modified) (1 diff)

branches/meh_branches/ppstack_test/ppStack/src/ppStackCombineFinal.c

@@ -71 +71 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Unable to do final combination.");
         psFree(reject);