X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.cpp;h=43d1175d3bb466c346dbbf1f1a65657fbd8bf203;hb=348bae08c18c66974533dde20ba3c426e881f929;hp=cb8e4a527938bde2dd056d2c563d61e6661fa579;hpb=9a0e130580f37277d94fd2637ee17bb9c181e110;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.cpp b/pv/views/trace/analogsignal.cpp
index cb8e4a5..43d1175 100644
--- a/pv/views/trace/analogsignal.cpp
+++ b/pv/views/trace/analogsignal.cpp
@@ -277,7 +277,7 @@ void AnalogSignal::paint_mid(QPainter &p, ViewItemPaintParams &pp)
 		paint_grid(p, y, pp.left(), pp.right());
 
 		shared_ptr<pv::data::AnalogSegment> segment = get_analog_segment_to_paint();
-		if (!segment)
+		if (!segment || (segment->get_sample_count() == 0))
 			return;
 
 		const double pixels_offset = pp.pixels_offset();
@@ -538,7 +538,7 @@ void AnalogSignal::paint_logic_mid(QPainter &p, ViewItemPaintParams &pp)
 	const float low_offset = y + nh - signal_margin - 0.5f;
 
 	shared_ptr<pv::data::LogicSegment> segment = get_logic_segment_to_paint();
-	if (!segment)
+	if (!segment || (segment->get_sample_count() == 0))
 		return;
 
 	double samplerate = segment->samplerate();
@@ -669,7 +669,7 @@ shared_ptr<pv::data::AnalogSegment> AnalogSignal::get_analog_segment_to_paint()
 				(segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
 			try {
 				segment = segments.at(current_segment_);
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				qDebug() << "Current analog segment out of range for signal" << base_->name() << ":" << current_segment_;
 			}
 		}
@@ -693,7 +693,7 @@ shared_ptr<pv::data::LogicSegment> AnalogSignal::get_logic_segment_to_paint() co
 				(segment_display_mode_ == ShowLastCompleteSegmentOnly)) {
 			try {
 				segment = segments.at(current_segment_);
-			} catch (out_of_range) {
+			} catch (out_of_range&) {
 				qDebug() << "Current logic segment out of range for signal" << base_->name() << ":" << current_segment_;
 			}
 		}