X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fdecodetrace.cpp;h=ddf006ce9139e6c35792ffb128360a0e7ee89705;hp=2ec84481b407c847996ca3c69e22075997b883c6;hb=83c23cc9fa0d4501d9e6b8759251fa6337f5d491;hpb=287d607f16c890e33355337436f182205baf466c

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 2ec84481..ddf006ce 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -111,8 +111,9 @@ const QColor DecodeTrace::OutlineColours[16] = {
 
 DecodeTrace::DecodeTrace(pv::SigSession &session,
 	boost::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
-	Trace(session, QString::fromUtf8(
+	Trace(QString::fromUtf8(
 		decoder_stack->stack().front()->decoder()->name)),
+	_session(session),
 	_decoder_stack(decoder_stack),
 	_delete_mapper(this),
 	_show_hide_mapper(this)
@@ -182,9 +183,9 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
 	const QString err = _decoder_stack->error_message();
 	if (!err.isEmpty())
 	{
-		draw_error(p, err, left, right);
 		draw_unresolved_period(p, annotation_height, left, right,
 			samples_per_pixel, pixels_offset);
+		draw_error(p, err, left, right);
 		return;
 	}
 
@@ -494,7 +495,8 @@ void DecodeTrace::create_decoder_form(int index,
 		connect(combo, SIGNAL(currentIndexChanged(int)),
 			this, SLOT(on_probe_selected(int)));
 		decoder_form->addRow(tr("<b>%1</b> (%2) *")
-			.arg(p->name).arg(p->desc), combo);
+			.arg(QString::fromUtf8(p->name))
+			.arg(QString::fromUtf8(p->desc)), combo);
 
 		const ProbeSelector s = {combo, dec, p};
 		_probe_selectors.push_back(s);
@@ -508,7 +510,8 @@ void DecodeTrace::create_decoder_form(int index,
 		connect(combo, SIGNAL(currentIndexChanged(int)),
 			this, SLOT(on_probe_selected(int)));
 		decoder_form->addRow(tr("<b>%1</b> (%2)")
-			.arg(p->name).arg(p->desc), combo);
+			.arg(QString::fromUtf8(p->name))
+			.arg(QString::fromUtf8(p->desc)), combo);
 
 		const ProbeSelector s = {combo, dec, p};
 		_probe_selectors.push_back(s);