From edb9a24727e27b9873cbb06ebc72d94381f41ea9 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 13 Apr 2015 22:43:22 -0400 Subject: when building context menu for click on mixer strip, ensure clicked-on strip sets selection appropriately --- gtk2_ardour/mixer_strip.cc | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 213c72ecab..6225f71b89 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1543,11 +1543,23 @@ MixerStrip::build_route_ops_menu () } items.push_back (SeparatorElem()); - /* note that this relies on selection being shared across editor and - mixer (or global to the backend, in the future), which is the only - sane thing for users anyway. - */ - items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks))); + + if (_route) { + /* note that this relies on selection being shared across editor and + mixer (or global to the backend, in the future), which is the only + sane thing for users anyway. + */ + + RouteTimeAxisView* rtav = PublicEditor::instance().get_route_view_by_route_id (_route->id()); + if (rtav) { + Selection& selection (PublicEditor::instance().get_selection()); + if (!selection.selected (rtav)) { + selection.set (rtav); + } + + items.push_front (MenuElem (_("Remove"), sigc::mem_fun(PublicEditor::instance(), &PublicEditor::remove_tracks))); + } + } } gboolean -- cgit v1.2.3