From 7ceb2376de956f72e2055467efe0a16a68da4bd8 Mon Sep 17 00:00:00 2001
From: Soeren Apel <soeren@apelpie.net>
Date: Tue, 17 Jul 2018 22:09:51 +0200
Subject: [PATCH] Channel popup: Don't disable channels when clicking the
 enable buttons

---
 pv/popups/channels.cpp | 16 +++++++++-------
 pv/popups/channels.hpp |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index ce023a8f..ffe42fd8 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -163,7 +163,7 @@ void Channels::set_all_channels(bool set)
 	updating_channels_ = false;
 }
 
-void Channels::set_all_channels_conditionally(
+void Channels::enable_channels_conditionally(
 	function<bool (const shared_ptr<data::SignalBase>)> cond_func)
 {
 	updating_channels_ = true;
@@ -174,8 +174,10 @@ void Channels::set_all_channels_conditionally(
 		assert(sig);
 
 		const bool state = cond_func(sig);
-		sig->set_enabled(state);
-		cb->setChecked(state);
+		if (state) {
+			sig->set_enabled(state);
+			cb->setChecked(state);
+		}
 	}
 
 	updating_channels_ = false;
@@ -303,25 +305,25 @@ void Channels::disable_all_channels()
 
 void Channels::enable_all_logic_channels()
 {
-	set_all_channels_conditionally([](const shared_ptr<SignalBase> signal)
+	enable_channels_conditionally([](const shared_ptr<SignalBase> signal)
 		{ return signal->type() == SignalBase::LogicChannel; });
 }
 
 void Channels::enable_all_analog_channels()
 {
-	set_all_channels_conditionally([](const shared_ptr<SignalBase> signal)
+	enable_channels_conditionally([](const shared_ptr<SignalBase> signal)
 		{ return signal->type() == SignalBase::AnalogChannel; });
 }
 
 void Channels::enable_all_named_channels()
 {
-	set_all_channels_conditionally([](const shared_ptr<SignalBase> signal)
+	enable_channels_conditionally([](const shared_ptr<SignalBase> signal)
 		{ return signal->name() != signal->internal_name(); });
 }
 
 void Channels::enable_all_changing_channels()
 {
-	set_all_channels_conditionally([](const shared_ptr<SignalBase> signal)
+	enable_channels_conditionally([](const shared_ptr<SignalBase> signal)
 		{
 			// Never enable channels without sample data
 			if (!signal->has_samples())
diff --git a/pv/popups/channels.hpp b/pv/popups/channels.hpp
index e486768f..344d21a8 100644
--- a/pv/popups/channels.hpp
+++ b/pv/popups/channels.hpp
@@ -71,7 +71,7 @@ public:
 
 private:
 	void set_all_channels(bool set);
-	void set_all_channels_conditionally(
+	void enable_channels_conditionally(
 		function<bool (const shared_ptr<data::SignalBase>)> cond_func);
 
 	void populate_group(shared_ptr<sigrok::ChannelGroup> group,
-- 
2.30.2