Changeset 9903 for trunk/psModules/src/camera/pmFPAfileDefine.c

Timestamp:

Nov 7, 2006, 4:09:31 PM (20 years ago)

Author:

Paul Price

Message:

Prepend the global path to the file rule.

File:

• trunk/psModules/src/camera/pmFPAfileDefine.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -536 +536 @@
     PS_ASSERT_INT_POSITIVE(strlen(filename), false);
 
-    if (*found)
-        return NULL;
+    if (*found) {
+        return NULL;
+    }
 
     // a camera config is needed (as source of file rule)
@@ -581 +582 @@
     }
 
+    // Prepend the global path to the file rule
+    if (config->workdir) {
+        psStringPrepend(&file->filerule, "%s/", config->workdir);
+    }
+
     if (found) {
         *found = true;
     }
-    psFree (fpa);
+    psFree (fpa);                       // Drop reference
+
     return file;
 }