X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fdecode%2Fdecoder.cpp;fp=pv%2Fdata%2Fdecode%2Fdecoder.cpp;h=1c941074a0a13ea1150d1f93391148247e01b88d;hp=511f7bffb67abcc4d65b9cfa1888a6cc55a5e2ba;hb=6e7a4a0066c15d99c891765bbc6797d339ac0ec8;hpb=03d2a4f8cacda8ad1d79b4e6a312ebe30b835a55

diff --git a/pv/data/decode/decoder.cpp b/pv/data/decode/decoder.cpp
index 511f7bff..1c941074 100644
--- a/pv/data/decode/decoder.cpp
+++ b/pv/data/decode/decoder.cpp
@@ -122,11 +122,14 @@ srd_decoder_inst* Decoder::create_decoder_inst(srd_session *session) const
 		g_str_equal, g_free, (GDestroyNotify)g_variant_unref);
 
 	for (DecodeChannel *ch : channels_) {
+		if (!ch->assigned_signal)
+			continue;
+
 		init_pin_states->data[ch->id] = ch->initial_pin_state;
 
-		GVariant *const gvar = g_variant_new_int32(ch->id);  // id = bit position
+		GVariant *const gvar = g_variant_new_int32(ch->bit_id);  // bit_id = bit position
 		g_variant_ref_sink(gvar);
-		// key is channel name, value is bit position in each sample
+		// key is channel name (pdch->id), value is bit position in each sample (gvar)
 		g_hash_table_insert(channels, ch->pdch_->id, gvar);
 	}