projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
34750ab
)
SamplingBar: Handle a failure to list the SAMPLERATE key
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 5 Jan 2015 20:10:44 +0000
(20:10 +0000)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 5 Jan 2015 20:13:41 +0000
(20:13 +0000)
This fixes #529
pv/toolbars/samplingbar.cpp
patch
|
blob
|
history
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 7ee4d98150b5ccdb491ff9e2093a3507a9e7ad0d..8c1b3c6d17691a42a1ee4dd80cbbf7d23ae106b4 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-183,8
+183,17
@@
void SamplingBar::update_sample_rate_selector()
const auto iter = keys.find(ConfigKey::SAMPLERATE);
if (iter != keys.end() &&
(*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
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);
- } else {
+ const auto keys = device->config_keys(
+ ConfigKey::DEVICE_OPTIONS);
+ try {
+ gvar_dict = device->config_list(ConfigKey::SAMPLERATE);
+ } catch(const sigrok::Error &e) {
+ // Failed to enunmerate samplerate
+ (void)e;
+ }
+ }
+
+ if (!gvar_dict) {
sample_rate_.show_none();
updating_sample_rate_ = false;
return;
sample_rate_.show_none();
updating_sample_rate_ = false;
return;