X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fview%2Fdecodetrace.cpp;h=020ce77090acd4d86bc06ba49185be1282106a02;hb=5da5d0813b0253fbe430d3a0b7cb780df1dcb72a;hp=38cbecb85337500cf3c20ca5963aa769918bb728;hpb=30bb6ca0a51a601c3bee8f53ccbbc7479aebf2d5;p=pulseview.git

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 38cbecb..020ce77 100644
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -733,7 +733,9 @@ QComboBox* DecodeTrace::create_channel_selector(
 		{
 			selector->addItem(s->name(),
 				qVariantFromValue((void*)s.get()));
-			if ((*channel_iter).second == s)
+
+			if (channel_iter != dec->channels().end() &&
+				(*channel_iter).second == s)
 				selector->setCurrentIndex(
 					selector->count() - 1);
 		}