From d2f46d2719dae993818784ffffc8697d7e827258 Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 8 Feb 2014 10:04:51 +0000
Subject: [PATCH] Fixed decoder probes auto-select logic

This fixes bug #310
---
 pv/sigsession.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 6f66be7..e507a09 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -233,10 +233,15 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 		decoder_stack = shared_ptr<data::DecoderStack>(
 			new data::DecoderStack(dec));
 
-		// Auto select the initial probes
+		// Make a list of all the probes
+		std::vector<const srd_probe*> all_probes;
 		for(const GSList *i = dec->probes; i; i = i->next)
-		{
-			const srd_probe *const probe = (const srd_probe*)i->data;
+			all_probes.push_back((const srd_probe*)i->data);
+		for(const GSList *i = dec->opt_probes; i; i = i->next)
+			all_probes.push_back((const srd_probe*)i->data);
+
+		// Auto select the initial probes
+		BOOST_FOREACH(const srd_probe *probe, all_probes)
 			BOOST_FOREACH(shared_ptr<view::Signal> s, _signals)
 			{
 				shared_ptr<view::LogicSignal> l =
@@ -246,7 +251,6 @@ bool SigSession::add_decoder(srd_decoder *const dec)
 					l->get_name().toLower()))
 					probes[probe] = l;
 			}
-		}
 
 		assert(decoder_stack);
 		assert(!decoder_stack->stack().empty());
-- 
2.30.2