X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=ce33c5a8e724b779214d61416e23cda74b91db39;hp=f762bd1a8ab83e56a1d8f2e9d3e733e54d9dc573;hb=d191508b2cfa24b5cf56c5184e7609353582f972;hpb=8a017a8bbc52e19c4d83362dbf58eb7ae447fd8b;ds=sidebyside

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index f762bd1a..ce33c5a8 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -47,12 +47,18 @@ QWidget* Enum::get_widget(QWidget *parent)
 	if (_selector)
 		return _selector;
 
+	const void *value = NULL;
+	if(_getter)
+		value = _getter();
+
 	_selector = new QComboBox(parent);
-	for (vector< pair<const void*, QString> >::const_iterator i =
-			_values.begin();
-		i != _values.end(); i++)
-		_selector->addItem((*i).second,
-			qVariantFromValue((void*)(*i).first));
+	for(unsigned int i = 0; i < _values.size(); i++) {
+		const pair<const void*, QString> &v = _values[i];
+		_selector->addItem(v.second,
+			qVariantFromValue((void*)v.first));
+		if(v.first == value)
+			_selector->setCurrentIndex(i);
+	}
 
 	return _selector;
 }