projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement "fill logic signal high areas" feature
[pulseview.git]
/
pv
/
devices
/
inputfile.cpp
diff --git
a/pv/devices/inputfile.cpp
b/pv/devices/inputfile.cpp
index 8e973f0561718d33fcd58afbc40659696e41417a..65331563937058e92d0716844f49088fc1760ee6 100644
(file)
--- a/
pv/devices/inputfile.cpp
+++ b/
pv/devices/inputfile.cpp
@@
-86,7
+86,7
@@
InputFile::InputFile(const shared_ptr<sigrok::Context> &context,
settings.endGroup();
}
settings.endGroup();
}
- } catch (out_of_range) {
+ } catch (out_of_range
&
) {
qWarning() << "Could not find input format" << format_name <<
"needed to restore session input file";
}
qWarning() << "Could not find input format" << format_name <<
"needed to restore session input file";
}
@@
-133,15
+133,16
@@
void InputFile::open()
f->read(buffer.data(), BufferSize);
const streamsize size = f->gcount();
f->read(buffer.data(), BufferSize);
const streamsize size = f->gcount();
+
if (size == 0)
if (size == 0)
-
return
;
+
throw QString("Failed to read file")
;
input_->send(buffer.data(), size);
try {
device_ = input_->device();
input_->send(buffer.data(), size);
try {
device_ = input_->device();
- } catch (sigrok::Error&) {
-
return
;
+ } catch (sigrok::Error&
e
) {
+
throw e
;
}
session_->add_device(device_);
}
session_->add_device(device_);