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 ae4f298b6f2eae30f744ce4636e344459b87b5c6..bafb9cd406bf05f9c76b54f2d91156e34d593e93 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-64,9
+64,11
@@
const uint64_t SamplingBar::RecordLengths[20] = {
const uint64_t SamplingBar::DefaultRecordLength = 1000000;
const uint64_t SamplingBar::DefaultRecordLength = 1000000;
-SamplingBar::SamplingBar(QWidget *parent) :
+SamplingBar::SamplingBar(
SigSession &session,
QWidget *parent) :
QToolBar("Sampling Bar", parent),
QToolBar("Sampling Bar", parent),
+ _session(session),
_device_selector(this),
_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),
@@
-122,6
+124,8
@@
SamplingBar::SamplingBar(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) {
@@
-130,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();
}
@@
-296,14
+302,16
@@
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();
+ _session.set_device(sdi);
_configure_button.set_popup(new DeviceOptions(sdi, this));
_configure_button.set_popup(new DeviceOptions(sdi, this));
- _probes_button.set_popup(new Probes(sdi, this));
-
- device_selected();
+ _probes_button.set_popup(new Probes(_session, this));
}
void SamplingBar::on_sample_rate_changed()
}
void SamplingBar::on_sample_rate_changed()