use Tracks' MainMenuDisabler during session lock (could be improved with more RAII)

1 files changed, 4 insertions, 11 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index ccb9fe55be..2d26a90a86 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -7547,15 +7547,10 @@ Editor::lock ()
 		lock_dialog->get_vbox()->show_all ();
 		lock_dialog->set_size_request (200, 200);
 	}
+
+	delete _main_menu_disabler;
+	_main_menu_disabler = new MainMenuDisabler;
 	
-#ifdef __APPLE__
-	/* The global menu bar continues to be accessible to applications
-	   with modal dialogs, which means that we need to desensitize
-	   all items in the menu bar. Since those items are really just
-	   proxies for actions, that means disabling all actions.
-	*/
-	ActionManager::disable_all_actions ();
-#endif
 	lock_dialog->present ();
 }
 
@@ -7564,9 +7559,7 @@ Editor::unlock ()
 {
 	lock_dialog->hide ();
 	
-#ifdef __APPLE__
-	ActionManager::pop_action_state ();
-#endif	
+	delete _main_menu_disabler;
 
 	if (ARDOUR_UI::config()->get_lock_gui_after_seconds()) {
 		start_lock_event_timing ();