summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-03-23 20:09:50 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-03-23 20:09:50 +0000
commitdf83cd7e5c48b1eac170522729f491d89291445f (patch)
treeef9a082a191655177edcb47e326bec6a1e0ccc76
parente79f953efdaecd9867045afc77d039a6cbc533bf (diff)
always build automation menu for route_time_axis, even for SAE version
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4883 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--gtk2_ardour/route_time_axis.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 1a85ef0307..c42448d31f 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -396,13 +396,8 @@ RouteTimeAxisView::playlist_click ()
void
RouteTimeAxisView::automation_click ()
{
- if (automation_action_menu == 0) {
- /* this seems odd, but the automation action
- menu is built as part of the display menu.
- */
- build_display_menu ();
- }
conditionally_add_to_selection ();
+ build_automation_action_menu ();
automation_action_menu->popup (1, gtk_get_current_event_time());
}
@@ -453,6 +448,7 @@ RouteTimeAxisView::build_display_menu ()
if (!Profile->get_sae()) {
build_remote_control_menu ();
items.push_back (MenuElem (_("Remote Control ID"), *remote_control_menu));
+ /* rebuild this every time */
build_automation_action_menu ();
items.push_back (MenuElem (_("Automation"), *automation_action_menu));
items.push_back (SeparatorElem());