From: Soeren Apel <redacted>
Date: Tue, 17 Apr 2018 20:23:23 +0000 (+0200)
Subject: Fix #1162 by always submitting all changed options to libsrd
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=c5f473341f9198532c44525104d04792c1bd6459;ds=sidebyside

Fix #1162 by always submitting all changed options to libsrd
---

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index c6995bcf..6ce60da8 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -91,8 +91,12 @@ void Decoder::set_option(const char *id, GVariant *value)
 		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);