Changeset 33638 for branches/eam_branches/ipp-20111122/ppStack/src/ppStackCombineInitial.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ppStack/src/ppStackCombineInitial.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/ppStack/src/ppStackCombineInitial.c

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