X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fdeviceoptions.cpp;h=2dc237a885ec6eec83f9efbdde0654ef0aa9b049;hp=26d4ef2a8fabe72dd3047525ca7e7c22112f0e99;hb=48c8844588e204568a7ae58abe0fb2070cd56d77;hpb=5b1994c45194a95069dfcadf637723f3db8249da

diff --git a/pv/prop/binding/deviceoptions.cpp b/pv/prop/binding/deviceoptions.cpp
index 26d4ef2a..2dc237a8 100644
--- a/pv/prop/binding/deviceoptions.cpp
+++ b/pv/prop/binding/deviceoptions.cpp
@@ -22,6 +22,8 @@
 
 #include <stdint.h>
 
+#include <QDebug>
+
 #include "deviceoptions.h"
 
 #include <pv/device/devinst.h>
@@ -46,7 +48,7 @@ namespace prop {
 namespace binding {
 
 DeviceOptions::DeviceOptions(shared_ptr<pv::device::DevInst> dev_inst,
-	const sr_probe_group *group) :
+	const sr_channel_group *group) :
 	_dev_inst(dev_inst),
 	_group(group)
 {
@@ -135,7 +137,11 @@ void DeviceOptions::bind_enum(const QString &name, int key,
 	vector< pair<GVariant*, QString> > values;
 
 	assert(_dev_inst);
-	assert(gvar_list);
+	if (!gvar_list) {
+		qDebug() << "Config key " << key << " was listed, but no "
+			"options were given";
+		return;
+	}
 
 	g_variant_iter_init (&iter, gvar_list);
 	while ((gvar = g_variant_iter_next_value (&iter)))