From 86123e2e4711e67f2246998b7172413199f231f4 Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Sun, 3 Apr 2016 20:33:19 +0200
Subject: [PATCH] Session: Improve signal handling during device selection

Changing devices now forces an update of the view's signal handling.
This will allow clearing the view properly in-between devices.
---
 pv/session.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pv/session.cpp b/pv/session.cpp
index 9fd8fb3e..e2b6dd71 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -138,6 +138,13 @@ void Session::set_device(shared_ptr<devices::Device> device)
 	if (device_)
 		device_->close();
 
+	device_.reset();
+
+	// Remove all traces
+	signals_.clear();
+	decode_traces_.clear();
+	signals_changed();
+
 	device_ = std::move(device);
 	device_->open();
 	device_->session()->add_datafeed_callback([=]
@@ -145,8 +152,6 @@ void Session::set_device(shared_ptr<devices::Device> device)
 			data_feed_in(device, packet);
 		});
 
-	decode_traces_.clear();
-
 	update_signals();
 	device_selected();
 }
-- 
2.30.2