From: Joel Holdsworth <redacted>
Date: Sat, 25 Jan 2014 12:06:11 +0000 (+0000)
Subject: pv::prop::Double: Do not create a widget if the initial value could not be retrieved
X-Git-Tag: pulseview-0.2.0~110
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=f45925927eba2b93f367e63f5e3b651e24c67eb3;ds=sidebyside

pv::prop::Double: Do not create a widget if the initial value could not be retrieved
---

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index fa5e5688..93b45d32 100644
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -55,6 +55,10 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
 	if (_spin_box)
 		return _spin_box;
 
+	GVariant *const value = _getter ? _getter() : NULL;
+	if (!value)
+		return NULL;
+
 	_spin_box = new QDoubleSpinBox(parent);
 	_spin_box->setDecimals(_decimals);
 	_spin_box->setSuffix(_suffix);
@@ -63,12 +67,8 @@ QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
 	if (_step)
 		_spin_box->setSingleStep(*_step);
 
-	GVariant *const value = _getter ? _getter() : NULL;
-
-	if (value) {
-		_spin_box->setValue(g_variant_get_double(value));
-		g_variant_unref(value);
-	}
+	_spin_box->setValue(g_variant_get_double(value));
+	g_variant_unref(value);
 
 	if (auto_commit)
 		connect(_spin_box, SIGNAL(valueChanged(double)),