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/actions.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/actions.cc')
| -rw-r--r-- | gtk2_ardour/actions.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index 41bc30266f..e9252bcbff 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -68,10 +68,10 @@ vector<RefPtr<Gtk::Action> > ActionManager::edit_point_in_region_sensitive_actio void ActionManager::init () { - ui_manager = UIManager::create (); - sys::path ui_file; + ui_manager = UIManager::create (); + SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path(); find_file_in_search_path (spath, "ardour.menus", ui_file); |