summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/tools/benchmark.c5
-rw-r--r--bin/tools/common.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/bin/tools/benchmark.c b/bin/tools/benchmark.c
index f4c6c52..99050f7 100644
--- a/bin/tools/benchmark.c
+++ b/bin/tools/benchmark.c
@@ -359,11 +359,6 @@ main (int argc, char *argv[])
goto cleanup_manager;
}
- if (!uca_camera_parse_arg_props (camera, argv, argc - 1, &error)) {
- g_print ("Error setting properties: %s\n", error->message);
- goto cleanup_camera;
- }
-
benchmark (camera, &options);
g_io_channel_shutdown (log_channel, TRUE, &error);
diff --git a/bin/tools/common.c b/bin/tools/common.c
index ee3c110..c849727 100644
--- a/bin/tools/common.c
+++ b/bin/tools/common.c
@@ -102,6 +102,8 @@ cleanup:
camera = uca_plugin_manager_get_camerav (manager, name, n_props, params, error);
+ uca_camera_parse_arg_props (camera, uca_prop_assignment_array, n_props, error);
+
for (guint i = 0; i < n_props; i++) {
/* cast is legit, because we created the string */
g_free ((gchar *) params[i].name);