summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-04-13 12:34:21 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-04-13 13:00:04 -0400
commitb7768becb5b0cdae32e0e810d347d979eae1045a (patch)
tree39c8a59b73f87f7a8672cf178944cc6e174200f6
parent82e6bdccf37248634297d548319cb8c831d38335 (diff)
use correctly named action to put preferences into the global menu bar on OS X
-rw-r--r--gtk2_ardour/ardour.menus.in2
-rw-r--r--gtk2_ardour/ardour_ui_ed.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour.menus.in b/gtk2_ardour/ardour.menus.in
index 30e9bf267b..4bfc87c187 100644
--- a/gtk2_ardour/ardour.menus.in
+++ b/gtk2_ardour/ardour.menus.in
@@ -296,8 +296,8 @@
</menu>
#ifndef GTKOSX
<separator/>
- <menuitem action='menu-show-preferences'/>
#endif
+ <menuitem action='menu-show-preferences'/>
</menu>
<menu name='RegionMenu' action='RegionMenu'>
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 3382a3f3d8..9accf78953 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -663,7 +663,7 @@ ARDOUR_UI::use_menubar_as_top_menubar ()
app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget));
}
- if ((widget = ActionManager::get_widget ("/ui/Main/Session/toggle-rc-options-editor"))) {
+ if ((widget = ActionManager::get_widget ("/ui/Main/Edit/menu-show-preferences"))) {
app->add_app_menu_item (group, dynamic_cast<MenuItem*>(widget));
}