resource.c: Fix firmware loading bug (#1140)

[libsigrok.git] / src / output / srzip.c

diff --git a/src/output/srzip.c b/src/output/srzip.c
index 6357a1c9072f7ddd5d9c4409bc456a8d78ab10f9..db2305767c857bff457f1d7515b6c9cc98fb38ec 100644 (file)
--- a/src/output/srzip.c
+++ b/src/output/srzip.c
@@ -150,6 +150,7 @@ static int zip_create(const struct sr_output *o)
                if (!ch->enabled)
                        continue;
 
+               s = NULL;
                switch (ch->type) {
                case SR_CHANNEL_LOGIC:
                        s = g_strdup_printf("probe%d", ch->index + 1);
@@ -160,8 +161,10 @@ static int zip_create(const struct sr_output *o)
                        index++;
                        break;
                }
-               g_key_file_set_string(meta, devgroup, s, ch->name);
-               g_free(s);
+               if (s) {
+                       g_key_file_set_string(meta, devgroup, s, ch->name);
+                       g_free(s);
+               }
        }
 
        metabuf = g_key_file_to_data(meta, &metalen, NULL);
@@ -465,9 +468,6 @@ static struct sr_option options[] = {
 
 static const struct sr_option *get_options(void)
 {
-       if (!options[0].def)
-               options[0].def = g_variant_ref_sink(g_variant_new_string(""));
-
        return options;
 }
 
@@ -476,7 +476,6 @@ static int cleanup(struct sr_output *o)
        struct out_context *outc;
 
        outc = o->priv;
-       g_variant_unref(options[0].def);
        g_free(outc->analog_index_map);
        g_free(outc->filename);
        g_free(outc);