cli: fix driver option conversion

[sigrok-cli.git] / sigrok-cli.c

diff --git a/sigrok-cli.c b/sigrok-cli.c
index 1168745a6d9e01ab145b8e75145148d0267fbbad..1b967814508ed76d906a9474faecd75e84df9ae1 100644 (file)
--- a/sigrok-cli.c
+++ b/sigrok-cli.c
@@ -132,7 +132,6 @@ static GSList *hash_to_hwopt(GHashTable *hash)
                value = g_hash_table_lookup(hash, key);
                hwopt->value = g_strdup(value);
                opts = g_slist_append(opts, hwopt);
-               break;
        }
        g_list_free(keys);
 
@@ -1382,13 +1381,6 @@ static void run_session(void)
                g_free(triggerlist);
        }
 
-       if (sr_dev_config_set(sdi, SR_HWCAP_PROBECONFIG,
-                       (char *)sdi->probes) != SR_OK) {
-               g_critical("Failed to configure probes.");
-               sr_session_destroy();
-               return;
-       }
-
        if (opt_continuous) {
                if (!sr_driver_hwcap_exists(sdi->driver, SR_HWCAP_CONTINUOUS)) {
                        g_critical("This device does not support continuous sampling.");
@@ -1513,10 +1505,10 @@ int main(int argc, char **argv)
                show_version();
        else if (opt_list_devs)
                show_dev_list();
+       else if (opt_pds && opt_show)
+               show_pd_detail();
        else if (opt_show)
                show_dev_detail();
-       else if (opt_pds)
-               show_pd_detail();
        else if (opt_input_file)
                load_input_file();
        else if (opt_samples || opt_time || opt_frames || opt_continuous)