Changeset 26869

Timestamp:

Feb 10, 2010, 4:10:23 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/20091201/pswarp/src/pswarpParseCamera.c (modified) (2 diffs)

branches/eam_branches/20091201/pswarp/src/pswarpParseCamera.c

@@ -23 +23 @@
     bool status;
 
-    // look for the file on the RUN metadata
-    pmFPAfile *file = pmFPAfileDefineFromRun(&status, bind, config, filerule); // File to return
+    pmFPAfile *file = NULL;
+    // look for the file on the argument list
+    if (bind) {
+        file = pmFPAfileBindFromArgs(&status, bind, config, filerule, argname);
+    } else {
+        file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
+    }
     if (!status) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to load file definition for %s", filerule);
@@ -30 +35 @@
     }
     if (!file) {
-        // look for the file on the argument list
-        if (bind) {
-            file = pmFPAfileBindFromArgs(&status, bind, config, filerule, argname);
-        } else {
-            file = pmFPAfileDefineFromArgs(&status, config, filerule, argname);
-        }
+        // look for the file on the RUN metadata
+        file = pmFPAfileDefineFromRun(&status, bind, config, filerule); // File to return
         if (!status) {
             psError(PSWARP_ERR_CONFIG, false, "Failed to load file definition for %s", filerule);
-            return false;
+            return NULL;
         }
     }