Changeset 33098 for branches/meh_branches/ppsub_test/ppStack/src/ppStackCombineInitial.c

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackCombineInitial.c (modified) (1 diff)

branches/meh_branches/ppsub_test/ppStack/src/ppStackCombineInitial.c

@@ -46 +46 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Unable to do initial combination.");
         return false;