projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainBar: Fix #594 by changing calling order and flag usage
[pulseview.git]
/
pv
/
toolbars
/
mainbar.cpp
diff --git
a/pv/toolbars/mainbar.cpp
b/pv/toolbars/mainbar.cpp
index 4bb39fac824795a56228baa32d90a476a43b4b41..529f25f46a1baf7bae3c4270d92c588ee052cd69 100644
(file)
--- a/
pv/toolbars/mainbar.cpp
+++ b/
pv/toolbars/mainbar.cpp
@@
-507,9
+507,6
@@
void MainBar::commit_sample_rate()
{
uint64_t sample_rate = 0;
{
uint64_t sample_rate = 0;
- if (updating_sample_rate_)
- return;
-
const shared_ptr<devices::Device> device =
device_selector_.selected_device();
if (!device)
const shared_ptr<devices::Device> device =
device_selector_.selected_device();
if (!device)
@@
-521,18
+518,14
@@
void MainBar::commit_sample_rate()
if (sample_rate == 0)
return;
if (sample_rate == 0)
return;
- // Set the samplerate
- assert(!updating_sample_rate_);
- updating_sample_rate_ = true;
try {
sr_dev->config_set(ConfigKey::SAMPLERATE,
Glib::Variant<guint64>::create(sample_rate));
try {
sr_dev->config_set(ConfigKey::SAMPLERATE,
Glib::Variant<guint64>::create(sample_rate));
-
on_config_changed
();
+
update_sample_rate_selector
();
} catch (Error error) {
qDebug() << "Failed to configure samplerate.";
return;
}
} catch (Error error) {
qDebug() << "Failed to configure samplerate.";
return;
}
- updating_sample_rate_ = false;
}
void MainBar::on_device_selected()
}
void MainBar::on_device_selected()
@@
-553,7
+546,8
@@
void MainBar::on_sample_count_changed()
void MainBar::on_sample_rate_changed()
{
void MainBar::on_sample_rate_changed()
{
- commit_sample_rate();
+ if (!updating_sample_rate_)
+ commit_sample_rate();
}
void MainBar::on_run_stop()
}
void MainBar::on_run_stop()
@@
-566,9
+560,8
@@
void MainBar::on_run_stop()
void MainBar::on_config_changed()
{
commit_sample_count();
void MainBar::on_config_changed()
{
commit_sample_count();
- update_sample_count_selector();
+ update_sample_count_selector();
commit_sample_rate();
commit_sample_rate();
- update_sample_rate_selector();
}
bool MainBar::eventFilter(QObject *watched, QEvent *event)
}
bool MainBar::eventFilter(QObject *watched, QEvent *event)