move location of menus file loading and call ActionManager::enable_accelerators(...

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index ef3dbe2de952b9185df61fade80d48032e7c0bc4..3948b5cc8c3da3d385f43e67c4d2605db31a1aa2 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -492,8 +492,6 @@ ARDOUR_UI::post_engine ()
 
        _tooltips.enable();
 
-       ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file);
-
        if (setup_windows ()) {
                throw failed_constructor ();
        }

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index fbfc8c7afd844bd263d7350a320c517c75915a64..bb0f375942348a2c9ca9f172ddfe52d073cba157 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -31,6 +31,7 @@
 
 #include "ardour/session.h"
 
+#include "actions.h"
 #include "ardour_ui.h"
 #include "public_editor.h"
 #include "mixer_ui.h"
@@ -59,6 +60,11 @@ ARDOUR_UI::we_have_dependents ()
        editor->setup_tooltips ();
        editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
 
+       /* all actions are defined */
+
+       ActionManager::enable_accelerators ();
+       ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file);
+
        editor->track_mixer_selection ();
        mixer->track_editor_selection ();
 }