X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fdouble.cpp;h=f39ae844fc97ce34b4519d4a67546a867e8cdb74;hp=57512d723ff26b5cd3473432040e975cf914e8bb;hb=46ebcd3f6f85092a9eb6401f6f56cee8fa08131a;hpb=bae42c1d8a6fbe65e412d56edecdd4b354908339 diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp index 57512d72..f39ae844 100644 --- a/pv/prop/double.cpp +++ b/pv/prop/double.cpp @@ -19,8 +19,11 @@ #include +#include #include +#include + #include "double.hpp" using boost::optional; @@ -54,9 +57,14 @@ QWidget* Double::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; + } spin_box_ = new QDoubleSpinBox(parent); spin_box_->setDecimals(decimals_); @@ -80,7 +88,15 @@ void Double::update_widget() if (!spin_box_) 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()); double value = Glib::VariantBase::cast_dynamic>(