Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / prop / enum.cpp

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index d4a04cbb748ae066fb66cebe29b244eca52c6a8f..6439a725c7adbdca16d90865c622da719fe9ef3b 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -37,12 +37,16 @@ Enum::Enum(QString name,
        _values(values),
        _selector(NULL)
 {
+       for (vector< pair<GVariant*, QString> >::const_iterator i =
+               _values.begin(); i != _values.end(); i++)
+               g_variant_ref((*i).first);
 }
 
 Enum::~Enum()
 {
-       for (unsigned int i = 0; i < _values.size(); i++)
-               g_variant_unref(_values[i].first);
+       for (vector< pair<GVariant*, QString> >::const_iterator i =
+               _values.begin(); i != _values.end(); i++)
+               g_variant_unref((*i).first);
 }
 
 QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
@@ -51,6 +55,8 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
                return _selector;
 
        GVariant *const value = _getter ? _getter() : NULL;
+       if (!value)
+               return NULL;
 
        _selector = new QComboBox(parent);
        for (unsigned int i = 0; i < _values.size(); i++) {