X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=b82b496eed42175f7361cd792a4ab8196036eee7;hp=d93d78eddf72589190cee89a2f0a082c76a9204b;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=bae42c1d8a6fbe65e412d56edecdd4b354908339;ds=sidebyside diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp index d93d78ed..b82b496e 100644 --- a/pv/prop/string.cpp +++ b/pv/prop/string.cpp @@ -19,9 +19,12 @@ #include +#include #include #include +#include + #include "string.hpp" using std::string; @@ -48,9 +51,14 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit) if (!getter_) return nullptr; - Glib::VariantBase variant = getter_(); - if (!variant.gobj()) + try { + Glib::VariantBase variant = getter_(); + if (!variant.gobj()) + return nullptr; + } catch (const sigrok::Error &e) { + qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what()); return nullptr; + } line_edit_ = new QLineEdit(parent); @@ -68,7 +76,15 @@ void String::update_widget() if (!line_edit_) return; - 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()); string value = Glib::VariantBase::cast_dynamic>(