From 6454b1e960c85b17ec9590b78bc0387dc348ae9b Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Mon, 5 Jan 2015 20:11:12 +0000 Subject: [PATCH] SamplingBar: Handle a failure to list the LIMIT_SAMPLES key --- pv/toolbars/samplingbar.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp index 8c1b3c6d..710f3128 100644 --- a/pv/toolbars/samplingbar.cpp +++ b/pv/toolbars/samplingbar.cpp @@ -293,9 +293,16 @@ void SamplingBar::update_sample_count_selector() 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); + try { + auto gvar = + device->config_list(ConfigKey::LIMIT_SAMPLES); + if (gvar) + g_variant_get(gvar.gobj(), "(tt)", + &min_sample_count, &max_sample_count); + } catch(const sigrok::Error &e) { + // Failed to query sample limit + (void)e; + } } min_sample_count = min(max(min_sample_count, MinSampleCount), -- 2.30.2