Changeset 28484 for branches/pap/psModules/src/camera/pmFPAfileIO.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/pmFPAfileIO.c (modified) (1 diff)

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

@@ -759 +759 @@
     psString realName = pmConfigConvertFilename(file->filename, config, create, false);
     if (!realName) {
-        psError(PS_ERR_IO, false, "failed to determine real name from template for %s\n", file->filename);
+        psError(psErrorCodeLast(), false, "failed to determine real name from template for %s\n",
+                file->filename);
         return false;
     }