X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=d62c901cf4c70d2c3848b3a3875d9d088596b794;hp=f8e39bf95cd323d1f8303df113e6706537af3999;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=2d20774fe218b2b72169fbbc37f161b7b2b6f410 diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp index f8e39bf9..d62c901c 100644 --- a/pv/prop/enum.cpp +++ b/pv/prop/enum.cpp @@ -29,6 +29,8 @@ #include #include +#include + #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; @@ -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_) {