X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdevicemanager.cpp;h=326cbca80f5daa0bb278ff388478fb1776d96dda;hp=7cb90bb8b9b8d9a964883b6f53d31c93071bbf3b;hb=72d85f366c78efac46c3332cfbfe11e73c5765a2;hpb=88fc05658247e71b8a3bfa8871d74bf923026f73

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index 7cb90bb8..326cbca8 100644
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/filesystem.hpp>
@@ -65,6 +65,11 @@ DeviceManager::~DeviceManager()
 {
 }
 
+const std::shared_ptr<sigrok::Context>& DeviceManager::context() const
+{
+	return context_;
+}
+
 shared_ptr<Context> DeviceManager::context()
 {
 	return context_;
@@ -209,17 +214,16 @@ void DeviceManager::build_display_name(shared_ptr<Device> device)
 	full_names_[device] = join(parts, " ");
 
 	// Next, build the display name. It only contains fields as required.
-	bool multiple_dev = false;
 
 	// If we can find another device with the same model/vendor then
 	// we have at least two such devices and need to distinguish them.
-	if (hardware_device)
-		multiple_dev = any_of(devices_.begin(), devices_.end(),
-			[&](shared_ptr<HardwareDevice> dev) {
+	const bool multiple_dev = hardware_device && any_of(
+		devices_.begin(), devices_.end(),
+		[&](shared_ptr<HardwareDevice> dev) {
 			return (dev->vendor() == hardware_device->vendor() &&
-			dev->model() == hardware_device->model()) &&
-			dev != hardware_device;
-			} );
+				dev->model() == hardware_device->model()) &&
+				dev != hardware_device;
+		} );
 
 	parts = {device->vendor(), device->model()};