X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=ddca7b5961a8145155c2a64ab0f9f6df0e1fea33;hb=ed1d9d81f46c6595bea7278aa5dc9c1213c81609;hp=2749e0ee73f1d55f4632282a56d2b7af868963b1;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 2749e0e..ddca7b5 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -177,9 +177,12 @@ void SamplingBar::update_sample_rate_selector()
 	assert(!updating_sample_rate_);
 	updating_sample_rate_ = true;
 
-	try {
+	const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+	const auto iter = keys.find(ConfigKey::SAMPLERATE);
+	if (iter != keys.end() &&
+		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
 		gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
-	} catch (Error error) {
+	} else {
 		sample_rate_.show_none();
 		updating_sample_rate_ = false;
 		return;
@@ -261,40 +264,45 @@ void SamplingBar::update_sample_count_selector()
 	assert(!updating_sample_count_);
 	updating_sample_count_ = true;
 
-	if (sample_count_supported_)
+	if (!sample_count_supported_)
 	{
-		uint64_t sample_count = sample_count_.value();
-		uint64_t min_sample_count = 0;
-		uint64_t max_sample_count = MaxSampleCount;
+		sample_count_.show_none();
+		updating_sample_count_ = false;
+		return;
+	}
 
-		if (sample_count == 0)
-			sample_count = DefaultSampleCount;
+	uint64_t sample_count = sample_count_.value();
+	uint64_t min_sample_count = 0;
+	uint64_t max_sample_count = MaxSampleCount;
 
-		try {
-			auto gvar = device->config_list(ConfigKey::LIMIT_SAMPLES);
-			g_variant_get(gvar.gobj(), "(tt)",
-				&min_sample_count, &max_sample_count);
-		} catch (Error error) {}
+	if (sample_count == 0)
+		sample_count = DefaultSampleCount;
 
-		min_sample_count = min(max(min_sample_count, MinSampleCount),
-			max_sample_count);
+	const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+	const auto iter = keys.find(ConfigKey::LIMIT_SAMPLES);
+	if (iter != keys.end() &&
+		(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+		auto gvar = device->config_list(ConfigKey::LIMIT_SAMPLES);
+		g_variant_get(gvar.gobj(), "(tt)",
+			&min_sample_count, &max_sample_count);
+	}
 
-		sample_count_.show_125_list(
-			min_sample_count, max_sample_count);
+	min_sample_count = min(max(min_sample_count, MinSampleCount),
+		max_sample_count);
 
-		try {
-			auto gvar = device->config_get(ConfigKey::LIMIT_SAMPLES);
-			sample_count = g_variant_get_uint64(gvar.gobj());
-			if (sample_count == 0)
-				sample_count = DefaultSampleCount;
-			sample_count = min(max(sample_count, MinSampleCount),
-				max_sample_count);
-		} catch (Error error) {}
-
-		sample_count_.set_value(sample_count);
-	}
-	else
-		sample_count_.show_none();
+	sample_count_.show_125_list(
+		min_sample_count, max_sample_count);
+
+	try {
+		auto gvar = device->config_get(ConfigKey::LIMIT_SAMPLES);
+		sample_count = g_variant_get_uint64(gvar.gobj());
+		if (sample_count == 0)
+			sample_count = DefaultSampleCount;
+		sample_count = min(max(sample_count, MinSampleCount),
+			max_sample_count);
+	} catch (Error error) {}
+
+	sample_count_.set_value(sample_count);
 
 	updating_sample_count_ = false;
 }