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

diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 1a85ef0307faa310535b10a78adab7cb5805f9cc..c42448d31f4df870a36f17e67b1f7b4c4b3f902e 100644 (file)
--- 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());