fixes for plugin selector and open session

git-svn-id: svn://localhost/trunk/ardour2@169 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 10 deletions

diff --git a/gtk2_ardour/plugin_selector.cc b/gtk2_ardour/plugin_selector.cc
index 3e6320f4d5..01d04235cf 100644
--- a/gtk2_ardour/plugin_selector.cc
+++ b/gtk2_ardour/plugin_selector.cc
@@ -277,16 +277,12 @@ PluginSelector::btn_add_clicked()
 void
 PluginSelector::btn_remove_clicked()
 {
-	if (o_selected_plug > -1){
-		gint row = 0;
-		list<PluginInfo*>::iterator i = added_plugins.begin();
-		while(row < o_selected_plug){
-			i++;
-			row++;
-		}
-		added_plugins.erase(i);
-		o_selected_plug = -1;
-	}
+	list<PluginInfo*>::iterator i;
+	Gtk::TreeModel::iterator iter = added_list.get_selection()->get_selected();
+	for (i = added_plugins.begin(); (*i) != (*iter)[acols.plugin]; ++i);
+
+	added_plugins.erase(i);	
+	amodel->erase(iter);
 }
 
 void