X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fsignal.cpp;h=5cd5b183590af45dcd783dd948f3a0d81af84582;hp=09a6da8f17a3d7b9b2377cfa0dc1a251e454edde;hb=8c09273b13a10399e7f7d18dd446c2d13813e239;hpb=99af6802961b0a5ec7ec7d3ff2215c8eb6925ca3

diff --git a/pv/view/signal.cpp b/pv/view/signal.cpp
index 09a6da8f..5cd5b183 100644
--- a/pv/view/signal.cpp
+++ b/pv/view/signal.cpp
@@ -66,8 +66,7 @@ Signal::Signal(pv::Session &session,
 	channel_(channel),
 	scale_handle_(make_shared<SignalScaleHandle>(*this)),
 	items_({scale_handle_}),
-	name_widget_(nullptr),
-	updating_name_widget_(false)
+	name_widget_(nullptr)
 {
 	assert(channel_);
 }
@@ -75,9 +74,9 @@ Signal::Signal(pv::Session &session,
 void Signal::set_name(QString name)
 {
 	Trace::set_name(name);
-	updating_name_widget_ = true;
-	name_widget_->setEditText(name);
-	updating_name_widget_ = false;
+
+	if (name != name_widget_->currentText())
+		name_widget_->setEditText(name);
 
 	// Store the channel name in sigrok::Channel so that it
 	// will end up in the .sr file upon save.
@@ -117,7 +116,7 @@ void Signal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
 	name_widget_ = new QComboBox(parent);
 	name_widget_->setEditable(true);
-	name_widget_->setCompleter(0);
+	name_widget_->setCompleter(nullptr);
 
 	for (unsigned int i = 0; i < countof(ChannelNames); i++)
 		name_widget_->insertItem(i, ChannelNames[i]);