X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=8243f32d0a1b63512d364ef4aea227c05d0bce35;hb=fe94bf8255145410d1673880932d59573c829b0e;hp=f8e39bf95cd323d1f8303df113e6706537af3999;hpb=2d20774fe218b2b72169fbbc37f161b7b2b6f410;p=pulseview.git

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index f8e39bf9..8243f32d 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -29,6 +29,8 @@
 #include <QLabel>
 #include <QSlider>
 
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
 #include "enum.hpp"
 
 using std::abs;
@@ -103,7 +105,15 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 	if (!getter_)
 		return nullptr;
 
-	Glib::VariantBase variant = getter_();
+	Glib::VariantBase variant;
+
+	try {
+		 variant = getter_();
+	} catch (const sigrok::Error &e) {
+		qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+		return nullptr;
+	}
+
 	if (!variant.gobj())
 		return nullptr;
 
@@ -143,7 +153,7 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 		selector_ = new QComboBox(parent);
 		for (unsigned int i = 0; i < values_.size(); i++) {
 			const pair<Glib::VariantBase, QString> &v = values_[i];
-			selector_->addItem(v.second, qVariantFromValue(v.first));
+			selector_->addItem(v.second, QVariant::fromValue(v.first));
 		}
 
 		update_widget();
@@ -158,7 +168,15 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 
 void Enum::update_widget()
 {
-	Glib::VariantBase variant = getter_();
+	Glib::VariantBase variant;
+
+	try {
+		variant = getter_();
+	} catch (const sigrok::Error &e) {
+		qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+		return;
+	}
+
 	assert(variant.gobj());
 
 	if (is_range_) {