X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=695d5f9f094b367a0b6aafc9050df2c9bad5f2ff;hb=951b5ae77957c8086f05fcd2b26beaf32f3e8e3e;hp=f6c418433021d9007400b7a407cfe6e7289a6487;hpb=78b0af3ebcbeab50e1c1634af729c0a7f97fb435;p=pulseview.git

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index f6c4184..695d5f9 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -48,6 +48,7 @@
 #include "viewport.hpp"
 
 #include "pv/session.hpp"
+#include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
 #include "pv/util.hpp"
@@ -323,7 +324,7 @@ pair<double, double> View::get_time_extents() const
 			const double start_time = s->start_time();
 			left_time = min(left_time, start_time);
 			right_time = max(right_time, start_time +
-				d->get_max_sample_count() / samplerate);
+				d->max_sample_count() / samplerate);
 		}
 	}
 
@@ -675,8 +676,12 @@ void View::signals_changed()
 	// Populate the traces
 	clear_child_items();
 
-	shared_ptr<sigrok::Device> device = session_.device();
-	assert(device);
+	const auto device = session_.device();
+	if (!device)
+		return;
+
+	shared_ptr<sigrok::Device> sr_dev = device->device();
+	assert(sr_dev);
 
 	// Collect a set of signals
 	unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
@@ -689,7 +694,7 @@ void View::signals_changed()
 		signal_map[sig->channel()] = sig;
 
 	// Populate channel groups
-	for (auto entry : device->channel_groups())
+	for (auto entry : sr_dev->channel_groups())
 	{
 		const shared_ptr<sigrok::ChannelGroup> &group = entry.second;
 
@@ -710,7 +715,7 @@ void View::signals_changed()
 	shared_ptr<TraceGroup> logic_trace_group(new TraceGroup());
 	int child_offset = 0;
 
-	if (add_channels_to_owner(device->channels(),
+	if (add_channels_to_owner(sr_dev->channels(),
 		logic_trace_group.get(), child_offset, signal_map,
 		[](shared_ptr<RowItem> r) -> bool {
 			return dynamic_pointer_cast<LogicSignal>(r) != nullptr;
@@ -722,7 +727,7 @@ void View::signals_changed()
 	}
 
 	// Add the remaining channels
-	add_channels_to_owner(device->channels(), this, offset, signal_map);
+	add_channels_to_owner(sr_dev->channels(), this, offset, signal_map);
 	assert(signal_map.empty());
 
 	// Add decode signals