summaryrefslogtreecommitdiff
path: root/gtk2_ardour/ardour_ui_dialogs.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-10-26 13:35:45 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-02-22 15:31:24 -0500
commit589f2a1ab83e4498920faa2f0ef37c1632eaf914 (patch)
treee49066b419b9d65e889093dc87f68a2ec6c3f7d9 /gtk2_ardour/ardour_ui_dialogs.cc
parent9b9a7beb130d183fc08a57927a3eaf4441be6809 (diff)
change suffix of keybinding files to ".keys" to avoid conflict with earlier versions.
Move some code around that should never have been inside libs/ardour to begin with.
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
-rw-r--r--gtk2_ardour/ardour_ui_dialogs.cc14
1 files changed, 11 insertions, 3 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index 7bc36dbc1f..b57808e24a 100644
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -478,9 +478,17 @@ ARDOUR_UI::create_key_editor ()
{
KeyEditor* kedit = new KeyEditor;
- kedit->add_tab (_("Global"), *global_bindings);
- kedit->add_tab (_("Editing"), *editor->bindings);
- kedit->add_tab (_("Mixing"), *mixer->bindings);
+ if (global_bindings) {
+ kedit->add_tab (_("Global"), *global_bindings);
+ }
+
+ if (editor->bindings) {
+ kedit->add_tab (_("Editing"), *editor->bindings);
+ }
+
+ if (mixer->bindings) {
+ kedit->add_tab (_("Mixing"), *mixer->bindings);
+ }
return kedit;
}