diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-14 17:41:29 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-14 17:41:29 +0000 |
commit | c66955386ecfb86b3dd2b137a8e6e4143711f329 (patch) | |
tree | 5da85b4fcf3b6c0c4c8cf2f4a49d2ed1eb88a147 /gtk2_ardour/ardour_ui.cc | |
parent | 28f328e09c6227ab6248c91ae0690a02d9d23300 (diff) |
make PluginManager API more in line with other singletons; do initial plugin discovery before beginning to construct the UI, so that if plugins create GUIs (e.g for license verification) they don't cause a run loop to catch the UIManager in an inconsistent state with menus defined but actions missing
git-svn-id: svn://localhost/ardour2/branches/3.0@10586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 811ebc2fdd..ed64f062c8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -62,6 +62,7 @@ #include "ardour/ardour.h" #include "ardour/callback.h" #include "ardour/profile.h" +#include "ardour/plugin_manager.h" #include "ardour/session_directory.h" #include "ardour/session_route.h" #include "ardour/session_state_utils.h" @@ -414,7 +415,10 @@ ARDOUR_UI::post_engine () ARDOUR::init_post_engine (); + /* load up the UI manager */ + ActionManager::init (); + _tooltips.enable(); if (setup_windows ()) { |