X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=1231eae4830b61ccc0429566963408e5bcbd175a;hp=e825337c6d4156fb4e430cfface2a5aab2d0cb08;hb=d5d1f925b5480e4f7d40a8cbc67bd653fa89bd89;hpb=a2321722dc5a2bade721a73551014908aff4cb4c

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index e825337..1231eae 100644
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -109,8 +109,7 @@ void Trace::paint_fore(QPainter &p, int left, int right)
 
 void Trace::paint_label(QPainter &p, int right, bool hover)
 {
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	const int y = get_y();
 
 	p.setBrush(_colour);
 
@@ -187,6 +186,7 @@ pv::widgets::Popup* Trace::create_popup(QWidget *parent)
 
 int Trace::get_y() const
 {
+	assert(_view);
 	return _v_offset - _view->v_offset();
 }
 
@@ -194,8 +194,6 @@ QRectF Trace::label_rect(int right)
 {
 	using pv::view::View;
 
-	assert(_view);
-
 	QFontMetrics m(QApplication::font());
 	const QSize text_size(
 		m.boundingRect(QRect(), 0, _name).width(),