projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Use srd_session_terminate_reset() for multi-segment data
[pulseview.git]
/
pv
/
session.cpp
diff --git
a/pv/session.cpp
b/pv/session.cpp
index e8174915e4043c37d508c3371b0c8007d168bd06..bf9e3a2c0897973854223520fb37c1fae83018f7 100644
(file)
--- a/
pv/session.cpp
+++ b/
pv/session.cpp
@@
-299,8
+299,8
@@
void Session::restore_settings(QSettings &settings)
filename.toStdString());
set_device(device);
filename.toStdString());
set_device(device);
- // TODO Perform error handling
-
start_capture([](QString infoMessage) { (void)
infoMessage; });
+ start_capture([](QString infoMessage) {
+
qDebug().noquote() << "Session error:" <<
infoMessage; });
set_name(QFileInfo(filename).fileName());
}
set_name(QFileInfo(filename).fileName());
}
@@
-953,10
+953,8
@@
void Session::sample_thread_proc(function<void (const QString)> error_handler)
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
set_capture_state(Stopped);
// Confirm that SR_DF_END was received
- if (cur_logic_segment_) {
- qDebug("SR_DF_END was not received.");
- assert(false);
- }
+ if (cur_logic_segment_)
+ qDebug() << "WARNING: SR_DF_END was not received.";
// Optimize memory usage
free_unused_memory();
// Optimize memory usage
free_unused_memory();