X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Ftoolbars%2Fsamplingbar.cpp;h=90dc6575896b16d9aa2effaf1dc5f763401362fe;hp=7e052f81cf6c16e77d91307fc956097fff410711;hb=f9541bde559ebdad1dff36bd27a2656ada99c6da;hpb=5ac961e325a9d2cbafdd8fae3a6704d7348cf19a

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index 7e052f81..90dc6575 100644
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -174,6 +174,7 @@ void SamplingBar::update_sample_rate_selector()
 	GVariant *gvar_dict, *gvar_list;
 	const uint64_t *elements = NULL;
 	gsize num_elements;
+	QAction *selector_action = NULL;
 
 	assert(_sample_rate_value_action);
 	assert(_sample_rate_list_action);
@@ -194,8 +195,9 @@ void SamplingBar::update_sample_rate_selector()
 				gvar_list, &num_elements, sizeof(uint64_t));
 		_sample_rate_value.setRange(elements[0], elements[1]);
 		_sample_rate_value.setSingleStep(elements[2]);
-		_sample_rate_value_action->setVisible(true);
 		g_variant_unref(gvar_list);
+
+		selector_action = _sample_rate_value_action;
 	}
 	else if ((gvar_list = g_variant_lookup_value(gvar_dict,
 			"samplerates", G_VARIANT_TYPE("at"))))
@@ -213,12 +215,18 @@ void SamplingBar::update_sample_rate_selector()
 		}
 
 		_sample_rate_list.show();
-		_sample_rate_list_action->setVisible(true);
 		g_variant_unref(gvar_list);
+
+		selector_action = _sample_rate_list_action;
 	}
 
 	g_variant_unref(gvar_dict);
 	update_sample_rate_selector_value();
+
+	// We delay showing the action, so that value change events
+	// are ignored.
+	if (selector_action)
+		selector_action->setVisible(true);
 }
 
 void SamplingBar::update_sample_rate_selector_value()
@@ -272,6 +280,9 @@ void SamplingBar::commit_sample_rate()
 				index).value<uint64_t>();
 	}
 
+	if (sample_rate == 0)
+		return;
+
 	// Set the samplerate
 	if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
 		g_variant_new_uint64(sample_rate)) != SR_OK) {