From fa55e1627af254fbf5957019f7dbc09c812c20c7 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Wed, 31 Jan 2018 04:50:22 +0100
Subject: [PATCH] Fix sensitivity of Tag-reset-button and row activation

---
 gtk2_ardour/plugin_selector.cc | 9 ++++++++-
 gtk2_ardour/plugin_selector.h  | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 925deea978..440b1295b5 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -267,7 +267,7 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 	tag_entry = manage (new Gtk::Entry);
 	tag_entry_connection = tag_entry->signal_changed().connect (sigc::mem_fun (*this, &PluginSelector::tag_entry_changed));
 
-	Gtk::Button* tag_reset_button = manage (new Button (_("Reset")));
+	tag_reset_button = manage (new Button (_("Reset")));
 	tag_reset_button->signal_clicked().connect (sigc::mem_fun (*this, &PluginSelector::tag_reset_button_clicked));
 
 	Gtk::Label* tagging_help_label1 = manage (new Label(
@@ -331,6 +331,7 @@ PluginSelector::PluginSelector (PluginManager& mgr)
 	plugin_display.grab_focus();
 
 	build_plugin_menu ();
+	display_selection_changed ();
 }
 
 PluginSelector::~PluginSelector ()
@@ -699,6 +700,10 @@ PluginSelector::load_plugin (PluginInfoPtr pi)
 void
 PluginSelector::btn_add_clicked()
 {
+	if (plugin_display.get_selection()->count_selected_rows() == 0) {
+		/* may happen with ctrl + double-click un-selecting but activating a row */
+		return;
+	}
 	std::string name;
 	PluginInfoPtr pi;
 	TreeModel::Row newrow = *(amodel->append());
@@ -739,12 +744,14 @@ PluginSelector::display_selection_changed()
 		tag_entry->set_text (tags);
 
 		tag_entry->set_sensitive (true);
+		tag_reset_button->set_sensitive (true);
 		btn_add->set_sensitive (true);
 
 	} else {
 		tag_entry->set_text ("");
 
 		tag_entry->set_sensitive (false);
+		tag_reset_button->set_sensitive (false);
 		btn_add->set_sensitive (false);
 	}
 	tag_entry_connection.unblock ();
diff --git a/gtk2_ardour/plugin_selector.h b/gtk2_ardour/plugin_selector.h
index d35b780261..bba22950ba 100644
--- a/gtk2_ardour/plugin_selector.h
+++ b/gtk2_ardour/plugin_selector.h
@@ -93,6 +93,7 @@ private:
 	Gtk::Button search_clear_button;
 
 	Gtk::Entry *tag_entry;
+	Gtk::Button* tag_reset_button;
 	void tag_reset_button_clicked ();
 
 	void set_sensitive_widgets();