Changeset 15364 for trunk/psModules/src/config/pmConfig.c

Timestamp:

Oct 23, 2007, 11:55:08 AM (19 years ago)

Author:

bills

Message:

If camera is specifed on command line, make sure that recipes specified on
command line get processed.

File:

• trunk/psModules/src/config/pmConfig.c (modified) (1 diff)

trunk/psModules/src/config/pmConfig.c

@@ -1050 +1050 @@
     }
 
+    // Now that we have the camera, we can apply recipes based on command-line arguments
+    if (readRecipes && !pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CL)) {
+        psError(PS_ERR_IO, false, "Error reading recipes from camera config for %s", config->cameraName);
+        return NULL;
+    }
+
     if (!config->format && !config->formatName) {
         config->formatName = name;