Fix output module enumeration + code cleanup.

[sigrok-cli.git] / main.c

diff --git a/main.c b/main.c
index 95b4258f477f4dc304ebf11fe7e7f52432316ddc..d300748bed13b6f863466685454032deac536505 100644 (file)
--- a/main.c
+++ b/main.c
@@ -90,6 +90,7 @@ static void set_options(void)
                return;
        }
        sdi = devices->data;
+       g_slist_free(devices);
 
        if (sr_dev_open(sdi) != SR_OK) {
                g_critical("Failed to open device.");
@@ -99,7 +100,6 @@ static void set_options(void)
        set_dev_options(sdi, devargs);
 
        sr_dev_close(sdi);
-       g_slist_free(devices);
        g_hash_table_destroy(devargs);
 
 }
@@ -162,6 +162,8 @@ int main(int argc, char **argv)
 
        if (opt_version)
                show_version();
+       else if (opt_output_format && opt_show)
+               show_output();
        else if (opt_scan_devs)
                show_dev_list();
 #ifdef HAVE_SRD