Changeset 26518 for trunk/ppSub/src/ppSubCamera.c

Timestamp:

Jan 5, 2010, 11:30:15 AM (16 years ago)

Author:

bills

Message:

files on command line override files in run data

File:

• trunk/ppSub/src/ppSubCamera.c (modified) (1 diff)

trunk/ppSub/src/ppSubCamera.c

@@ -32 +32 @@
     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(PS_ERR_UNKNOWN, false, "Failed to load file definition for %s", filerule);
-        return NULL;
-    }
-    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);
-        }
+        return false;
+    }
+    if (!file) {
+        // look for the file on the RUN metadata
+        file = pmFPAfileDefineFromRun(&status, bind, config, filerule); // File to return
         if (!status) {
             psError(PS_ERR_UNKNOWN, false, "Failed to load file definition for %s", filerule);
-            return false;
+            return NULL;
         }
     }