Changeset 28484 for branches/pap/psModules/src/camera/pmReadoutFake.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/camera/pmReadoutFake.c (modified) (1 diff)

branches/pap/psModules/src/camera/pmReadoutFake.c

@@ -303 +303 @@
 
                 if (!psThreadJobAddPending(job)) {
-                    psFree(job);
                     psFree(groups);
                     return false;
                 }
-                psFree(job);
             }
             if (!psThreadPoolWait(true)) {