X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Ftoolbars%2Fmainbar.cpp;h=b404b3da45b32666f335fbee88d773c657b0b855;hb=e13e7879200700579516c0ba09bfd0253b8a2297;hp=4bb39fac824795a56228baa32d90a476a43b4b41;hpb=9dd888899b1318787ffae6db62f4948b9aee2b84;p=pulseview.git

diff --git a/pv/toolbars/mainbar.cpp b/pv/toolbars/mainbar.cpp
index 4bb39fa..b404b3d 100644
--- a/pv/toolbars/mainbar.cpp
+++ b/pv/toolbars/mainbar.cpp
@@ -474,9 +474,6 @@ void MainBar::commit_sample_count()
 {
 	uint64_t sample_count = 0;
 
-	if (updating_sample_count_)
-		return;
-
 	const shared_ptr<devices::Device> device =
 		device_selector_.selected_device();
 	if (!device)
@@ -485,31 +482,28 @@ void MainBar::commit_sample_count()
 	const shared_ptr<sigrok::Device> sr_dev = device->device();
 
 	sample_count = sample_count_.value();
-
-	// Set the sample count
-	assert(!updating_sample_count_);
-	updating_sample_count_ = true;
 	if (sample_count_supported_)
 	{
 		try {
 			sr_dev->config_set(ConfigKey::LIMIT_SAMPLES,
 				Glib::Variant<guint64>::create(sample_count));
-			on_config_changed();
+			update_sample_count_selector();
 		} catch (Error error) {
 			qDebug() << "Failed to configure sample count.";
 			return;
 		}
 	}
-	updating_sample_count_ = false;
+
+	// Devices with built-in memory might impose limits on certain
+	// configurations, so let's check what sample rate the driver
+	// lets us use now.
+	update_sample_rate_selector();
 }
 
 void MainBar::commit_sample_rate()
 {
 	uint64_t sample_rate = 0;
 
-	if (updating_sample_rate_)
-		return;
-
 	const shared_ptr<devices::Device> device =
 		device_selector_.selected_device();
 	if (!device)
@@ -521,18 +515,19 @@ void MainBar::commit_sample_rate()
 	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));
-		on_config_changed();
+		update_sample_rate_selector();
 	} catch (Error error) {
 		qDebug() << "Failed to configure samplerate.";
 		return;
 	}
-	updating_sample_rate_ = false;
+
+	// Devices with built-in memory might impose limits on certain
+	// configurations, so let's check what sample count the driver
+	// lets us use now.
+	update_sample_count_selector();
 }
 
 void MainBar::on_device_selected()
@@ -548,12 +543,14 @@ void MainBar::on_device_selected()
 
 void MainBar::on_sample_count_changed()
 {
-	commit_sample_count();
+	if (!updating_sample_count_)
+		commit_sample_count();
 }
 
 void MainBar::on_sample_rate_changed()
 {
-	commit_sample_rate();
+	if (!updating_sample_rate_)
+		commit_sample_rate();
 }
 
 void MainBar::on_run_stop()
@@ -566,9 +563,7 @@ void MainBar::on_run_stop()
 void MainBar::on_config_changed()
 {
 	commit_sample_count();
-	update_sample_count_selector();	
 	commit_sample_rate();	
-	update_sample_rate_selector();
 }
 
 bool MainBar::eventFilter(QObject *watched, QEvent *event)