TabularDecModel: Fix multi-row selection issue

[pulseview.git] / pv / views / tabular_decoder / model.cpp

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index 0c89cef314f3a8547dfdad3659a90fc1c21676cc..ffd151a5300c4278a297a45fe040b84f22e4e246 100644 (file)
--- a/pv/views/tabular_decoder/model.cpp
+++ b/pv/views/tabular_decoder/model.cpp
@@ -80,7 +80,7 @@ QVariant AnnotationCollectionModel::data_from_ann(const Annotation* ann, int ind
 
 QVariant AnnotationCollectionModel::data(const QModelIndex& index, int role) const
 {
-       if (!index.isValid() || !signal_)
+       if (!signal_ || !index.isValid() || !index.internalPointer())
                return QVariant();
 
        const Annotation* ann =
@@ -118,7 +118,7 @@ Qt::ItemFlags AnnotationCollectionModel::flags(const QModelIndex& index) const
 QVariant AnnotationCollectionModel::headerData(int section, Qt::Orientation orientation,
        int role) const
 {
-       if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+       if ((orientation == Qt::Horizontal) && (role == Qt::DisplayRole))
                return header_data_.at(section);
 
        return QVariant();
@@ -128,6 +128,8 @@ QModelIndex AnnotationCollectionModel::index(int row, int column,
        const QModelIndex& parent_idx) const
 {
        (void)parent_idx;
+       assert(row >= 0);
+       assert(column >= 0);
 
        if (!all_annotations_)
                return QModelIndex();