X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=f86c5d08dc86d9261718ab92e2005b1b30dbd914;hb=72486b789078f024e4f3404f81118c03b03e2b70;hp=c6995bcf703a56cb13b4ba347acb2c61aa11d17e;hpb=8ce0e732cfe912e022eb96d06aaaa40390efcd6b;p=pulseview.git

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index c6995bc..f86c5d0 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -87,12 +87,21 @@ void Decoder::set_option(const char *id, GVariant *value)
 	options_[id] = value;
 
 	// If we have a decoder instance, apply option value immediately
+	apply_all_options();
+}
+
+void Decoder::apply_all_options()
+{
 	if (decoder_inst_) {
 		GHashTable *const opt_hash = g_hash_table_new_full(g_str_hash,
 			g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
-		g_variant_ref(value);
-		g_hash_table_insert(opt_hash, (void*)g_strdup(id), value);
+		for (const auto& option : options_) {
+			GVariant *const value = option.second;
+			g_variant_ref(value);
+			g_hash_table_replace(opt_hash, (void*)g_strdup(
+				option.first.c_str()), value);
+		}
 
 		srd_inst_option_set(decoder_inst_, opt_hash);
 		g_hash_table_destroy(opt_hash);