X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=7ee4d98150b5ccdb491ff9e2093a3507a9e7ad0d;hb=53a7cce47482b2220e023bfcb9b4069b6eb88805;hp=cddfa5f5d39f8d9a8b327038757e690d598d877e;hpb=2b81ae4682ade4109ffa442794de36ceb32045eb;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index cddfa5f..7ee4d98 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -111,7 +111,7 @@ SamplingBar::SamplingBar(Session &session, MainWindow &main_window) :
 }
 
 void SamplingBar::set_device_list(
-	const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+	const std::list< std::shared_ptr<sigrok::Device> > &devices,
 	shared_ptr<Device> selected)
 {
 	int selected_index = -1;
@@ -122,12 +122,12 @@ void SamplingBar::set_device_list(
 
 	device_selector_.clear();
 
-	for (auto entry : devices) {
-		auto device = entry.first;
-		auto display_name = entry.second;
-
+	for (auto device : devices) {
 		assert(device);
 
+		string display_name =
+			session_.device_manager().get_display_name(device);
+
 		if (selected == device)
 			selected_index = device_selector_.count();
 
@@ -432,7 +432,7 @@ void SamplingBar::on_device_selected()
 	if (!device)
 		return;
 
-	session_.set_device(device);
+	main_window_.select_device(device);
 
 	update_device_config_widgets();
 }