projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix segfault in connect device dialog
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 24c5a420e1782ce0834b172ecdaa60c0e6782d88..bafb9cd406bf05f9c76b54f2d91156e34d593e93 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-68,6
+68,7
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
QToolBar("Sampling Bar", parent),
_session(session),
_device_selector(this),
QToolBar("Sampling Bar", parent),
_session(session),
_device_selector(this),
+ _updating_device_selector(false),
_configure_button(this),
_probes_button(this),
_record_length_selector(this),
_configure_button(this),
_probes_button(this),
_record_length_selector(this),
@@
-123,6
+124,8
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
void SamplingBar::set_device_list(
const std::list<struct sr_dev_inst*> &devices)
{
void SamplingBar::set_device_list(
const std::list<struct sr_dev_inst*> &devices)
{
+ _updating_device_selector = true;
+
_device_selector.clear();
BOOST_FOREACH (sr_dev_inst *sdi, devices) {
_device_selector.clear();
BOOST_FOREACH (sr_dev_inst *sdi, devices) {
@@
-131,6
+134,8
@@
void SamplingBar::set_device_list(
qVariantFromValue((void*)sdi));
}
qVariantFromValue((void*)sdi));
}
+ _updating_device_selector = false;
+
update_sample_rate_selector();
}
update_sample_rate_selector();
}
@@
-297,6
+302,9
@@
void SamplingBar::on_device_selected()
{
using namespace pv::popups;
{
using namespace pv::popups;
+ if (_updating_device_selector)
+ return;
+
update_sample_rate_selector();
sr_dev_inst *const sdi = get_selected_device();
update_sample_rate_selector();
sr_dev_inst *const sdi = get_selected_device();