projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1e1b3a6
)
Session: Catch errors listing the config keys
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 6 Apr 2015 09:11:59 +0000
(10:11 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Thu, 11 Jun 2015 18:38:47 +0000
(20:38 +0200)
pv/session.cpp
patch
|
blob
|
history
diff --git
a/pv/session.cpp
b/pv/session.cpp
index d5126660f56b140d2337d64b1df625a4ea44b148..2cdc25f83ed0ee3c718896da9d8df98d13f34876 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-400,7
+400,12
@@
shared_ptr<view::Signal> Session::signal_from_channel(
void Session::read_sample_rate(shared_ptr<sigrok::Device> device)
{
assert(device);
void Session::read_sample_rate(shared_ptr<sigrok::Device> device)
{
assert(device);
- const auto keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+ map< const ConfigKey*, set<sigrok::Capability> > keys;
+
+ try {
+ keys = device->config_keys(ConfigKey::DEVICE_OPTIONS);
+ } catch (const Error) {}
+
const auto iter = keys.find(ConfigKey::SAMPLERATE);
cur_samplerate_ = (iter != keys.end() &&
(*iter).second.find(sigrok::GET) != (*iter).second.end()) ?
const auto iter = keys.find(ConfigKey::SAMPLERATE);
cur_samplerate_ = (iter != keys.end() &&
(*iter).second.find(sigrok::GET) != (*iter).second.end()) ?