From 0912f8a7b0fde306f2616fef3c63ce742006602d Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 7 Apr 2013 20:49:10 +0100 Subject: [PATCH] Enum now allows the no-selection condition --- pv/prop/enum.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index 065fd548..ced2f2bb 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -51,13 +51,12 @@ QWidget* Enum::get_widget(QWidget *parent) return _selector; GVariant *const value = _getter ? _getter() : NULL; - assert(value); _selector = new QComboBox(parent); for (unsigned int i = 0; i < _values.size(); i++) { const pair &v = _values[i]; _selector->addItem(v.second, qVariantFromValue((void*)v.first)); - if (g_variant_compare(v.first, value) == 0) + if (value && g_variant_compare(v.first, value) == 0) _selector->setCurrentIndex(i); } -- 2.30.2