Changeset 18649 for trunk/ppSub/src/ppSub.c

Timestamp:

Jul 21, 2008, 3:22:57 PM (18 years ago)

Author:

Paul Price

Message:

Can't parse the arguments before setting up the camera --- camera-dependent recipes can't get updated.

File:

• trunk/ppSub/src/ppSub.c (modified) (2 diffs)

trunk/ppSub/src/ppSub.c

@@ -22 +22 @@
     }
 
-    if (!ppSubArguments(argc, argv, config)) {
-        psErrorStackPrint(stderr, "Error reading arguments.\n");
-        exitValue = PS_EXIT_CONFIG_ERROR;
-        goto die;
-    }
-
     if (!pmModelClassInit()) {
         psErrorStackPrint(stderr, "Error initialising model classes.\n");
@@ -34 +28 @@
     }
 
+    if (!ppSubArgumentsSetup(argc, argv, config)) {
+        psErrorStackPrint(stderr, "Error reading arguments.\n");
+        exitValue = PS_EXIT_CONFIG_ERROR;
+        goto die;
+    }
+
     if (!ppSubCamera(config)) {
         psErrorStackPrint(stderr, "Error setting up camera.\n");
+        exitValue = PS_EXIT_CONFIG_ERROR;
+        goto die;
+    }
+
+    if (!ppSubArgumentsParse(config)) {
+        psErrorStackPrint(stderr, "Error reading arguments.\n");
         exitValue = PS_EXIT_CONFIG_ERROR;
         goto die;