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/mixer_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/mixer_ui.cc')
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index e65afb4cc7..c3aa14d6e2 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -230,7 +230,7 @@ Mixer_UI::Mixer_UI () MonitorSection::setup_knob_images (); #ifndef DEFER_PLUGIN_SELECTOR_LOAD - _plugin_selector = new PluginSelector (PluginManager::the_manager ()); + _plugin_selector = new PluginSelector (PluginManager::instance ()); #endif } @@ -1668,7 +1668,7 @@ Mixer_UI::plugin_selector() { #ifdef DEFER_PLUGIN_SELECTOR_LOAD if (!_plugin_selector) - _plugin_selector = new PluginSelector (PluginManager::the_manager ()); + _plugin_selector = new PluginSelector (PluginManager::instance()); #endif return _plugin_selector; |