summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-12-04 13:37:35 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-12-04 13:37:35 +0000
commit1a1716c6f2afc028415c11ef6243895e262ae46c (patch)
tree7cb2f8b6d0349833635ff47d85fbad13f815c85d
parent6e3190e17c83b468abf262618e7341b778819d85 (diff)
properly tear-down route_ops_menu in mixer strip when route is changed, and make it popup on button1 or button3
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4282 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/mixer_strip.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index d4f25d1896..f721953395 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -388,6 +388,9 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
meter_point_label.set_text (_("post"));
break;
}
+
+ delete route_ops_menu;
+ route_ops_menu = 0;
ARDOUR_UI::instance()->tooltips().set_tip (comment_button, _route->comment().empty() ?
_("Click to Add/Edit Comments"):
@@ -1038,7 +1041,7 @@ void
MixerStrip::build_route_ops_menu ()
{
using namespace Menu_Helpers;
- route_ops_menu = manage (new Menu);
+ route_ops_menu = new Menu;
route_ops_menu->set_name ("ArdourContextMenu");
MenuList& items = route_ops_menu->items();
@@ -1069,7 +1072,7 @@ MixerStrip::build_route_ops_menu ()
gint
MixerStrip::name_button_button_press (GdkEventButton* ev)
{
- if (ev->button == 1) {
+ if (ev->button == 1 || ev->button == 3) {
list_route_operations ();
Menu_Helpers::MenuList& items = route_ops_menu->items();