From 39e680c230c4f26f25d2688028964732647b957f Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sat, 18 Jan 2014 16:04:07 +0000
Subject: [PATCH] SigSession: Tidied update_signals

---
 pv/sigsession.cpp | 53 +++++++++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 23 deletions(-)

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 82fa8770..ecc12503 100644
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -384,7 +384,6 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 {
 	assert(_capture_state == Stopped);
 
-	shared_ptr<view::Signal> signal;
 	unsigned int logic_probe_count = 0;
 	unsigned int analog_probe_count = 0;
 
@@ -429,34 +428,42 @@ void SigSession::update_signals(const sr_dev_inst *const sdi)
 	}
 
 	// Make the Signals list
-	{
+	do {
 		lock_guard<mutex> lock(_signals_mutex);
 
 		_signals.clear();
 
-		if(sdi) {
-			for (const GSList *l = sdi->probes; l; l = l->next) {
-				sr_probe *const probe =	(sr_probe *)l->data;
-				assert(probe);
-
-				switch(probe->type) {
-				case SR_PROBE_LOGIC:
-					signal = shared_ptr<view::Signal>(
-						new view::LogicSignal(*this, probe,
-							_logic_data));
-					break;
-
-				case SR_PROBE_ANALOG:
-					signal = shared_ptr<view::Signal>(
-						new view::AnalogSignal(*this, probe,
-							_analog_data));
-					break;
-				}
-
-				_signals.push_back(signal);
+		if(!sdi)
+			break;
+
+		for (const GSList *l = sdi->probes; l; l = l->next) {
+			shared_ptr<view::Signal> signal;
+			sr_probe *const probe =	(sr_probe *)l->data;
+			assert(probe);
+
+			switch(probe->type) {
+			case SR_PROBE_LOGIC:
+				signal = shared_ptr<view::Signal>(
+					new view::LogicSignal(*this, probe,
+						_logic_data));
+				break;
+
+			case SR_PROBE_ANALOG:
+				signal = shared_ptr<view::Signal>(
+					new view::AnalogSignal(*this, probe,
+						_analog_data));
+				break;
+
+			default:
+				assert(0);
+				break;
 			}
+
+			assert(signal);
+			_signals.push_back(signal);
 		}
-	}
+
+	} while(0);
 
 	signals_changed();
 }
-- 
2.30.2