summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_dependents.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2019-01-13 12:01:18 -0600
committerPaul Davis <paul@linuxaudiosystems.com>2019-01-13 12:01:18 -0600
commit9d1fa8f820c365d58aab2a620b5d49d6ec5310e7 (patch)
tree761bcc9d7b1770e63996b93c7cfa79673acf3eb3 /gtk2_ardour/ardour_ui_dependents.cc
parente5ae620c0b92064dc78662f5426d396761f08097 (diff)
re-order startup process, registering actions early
Mostly to stop an error when UIConfiguration::map_parameters() looks for an action that has not yet been registered
Diffstat (limited to 'gtk2_ardour/ardour_ui_dependents.cc')
-rw-r--r--gtk2_ardour/ardour_ui_dependents.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index 1ab8277fff..dcf5761769 100644
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -75,7 +75,8 @@ ARDOUR_UI::we_have_dependents ()
error << _("Global keybindings are missing") << endmsg;
}
- install_actions ();
+ install_dependent_actions ();
+
/* The monitor section relies on at least 1 action defined by us. Since that
* action now exists, give it a chance to use it.
*/
@@ -85,7 +86,7 @@ ARDOUR_UI::we_have_dependents ()
*/
ProcessorBox::register_actions ();
StepEntry::setup_actions_and_bindings ();
-
+
/* Global, editor, mixer, processor box actions are defined now. Link
them with any bindings, so that GTK does not get a chance to define
the GTK accel map entries first when we ask the GtkUIManager to