Commit the samplerate before beginning to sample

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index c35faadad49f5773a179810165bc8b5e8dda4013..401652cbe7b251eba52fe6bcd998cd2a98dd80d4 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -72,7 +72,7 @@ SamplingBar::SamplingBar(QWidget *parent) :
        _run_stop_button(this)
 {
        connect(&_run_stop_button, SIGNAL(clicked()),
-               this, SIGNAL(run_stop()));
+               this, SLOT(on_run_stop()));
        connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
                this, SLOT(on_device_selected()));
        connect(&_configure_button, SIGNAL(clicked()),
@@ -303,5 +303,11 @@ void SamplingBar::on_configure()
        update_sample_rate_selector_value();
 }
 
+void SamplingBar::on_run_stop()
+{
+       commit_sample_rate();   
+       run_stop();
+}
+
 } // namespace toolbars
 } // namespace pv

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index d7ad4f2f604107c50b783ab22cb6e545826f11cc..a61a949eabc0ef8538d9c2ac0fa5343f81cfccf7 100644 (file)
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -68,6 +68,7 @@ private slots:
        void on_device_selected();
        void on_sample_rate_changed();
        void on_configure();
+       void on_run_stop();
 
 private:
        QComboBox _device_selector;