X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftabular_decoder%2Fmodel.cpp;h=b87bf05869ef1f118ad69853ff3899ec4e1d097a;hp=110cfd62b98d2280acea700a1ce130a50eb5f5a3;hb=4d0f333acdcd747ffc542d77e679ce08af6031ae;hpb=49a0a40345eb84be2c953c5f83cd0c9ccada6360

diff --git a/pv/views/tabular_decoder/model.cpp b/pv/views/tabular_decoder/model.cpp
index 110cfd62..b87bf058 100644
--- a/pv/views/tabular_decoder/model.cpp
+++ b/pv/views/tabular_decoder/model.cpp
@@ -324,9 +324,9 @@ QModelIndex AnnotationCollectionModel::update_highlighted_rows(QModelIndex first
 		// we would need to highlight - only then do we do so
 		QModelIndex index = first;
 		do {
-			const Annotation* ann =
-				static_cast<const Annotation*>(index.internalPointer());
-			assert(ann);
+			const Annotation* ann =	static_cast<const Annotation*>(index.internalPointer());
+			if (!ann)  // Can happen if the table is being modified at this exact time
+				return result;
 
 			if (((int64_t)ann->start_sample() <= sample_num) &&
 				((int64_t)ann->end_sample() >= sample_num)) {