Signal: Save and load signal names as UTF-8 strings.

[pulseview.git] / pv / view / decodetrace.cpp

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 01bf934c47095003e3265420622344a6235dc92a..0fbd16fd22b5e636a6b71d1ef3c27cea3d01fe40 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -41,7 +41,7 @@ extern "C" {
 
 #include "decodetrace.hpp"
 
-#include <pv/sigsession.hpp>
+#include <pv/session.hpp>
 #include <pv/data/decoderstack.hpp>
 #include <pv/data/decode/decoder.hpp>
 #include <pv/data/logic.hpp>
@@ -123,7 +123,7 @@ const QColor DecodeTrace::OutlineColours[16] = {
        QColor(0x6B, 0x23, 0x37)
 };
 
-DecodeTrace::DecodeTrace(pv::SigSession &session,
+DecodeTrace::DecodeTrace(pv::Session &session,
        std::shared_ptr<pv::data::DecoderStack> decoder_stack, int index) :
        Trace(QString::fromUtf8(
                decoder_stack->stack().front()->decoder()->name)),
@@ -609,9 +609,8 @@ void DecodeTrace::hover_point_changed()
        QString ann = get_annotation_at_point(hp);
 
        assert(view);
-       assert(row_height_);
 
-       if (ann.isEmpty()) {
+       if (!row_height_ || ann.isEmpty()) {
                hide_hover_annotation();
                return;
        }