Merged with trunk R1141

git-svn-id: svn://localhost/ardour2/branches/midi@1142 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 2 deletions

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index b19a9f74eb..56b9e34d35 100644
--- a/gtk2_ardour/plugin_ui.cc
+++ b/gtk2_ardour/plugin_ui.cc
@@ -118,16 +118,21 @@ PluginUIWindow::PluginUIWindow (boost::shared_ptr<PluginInsert> insert, bool scr
 PluginUIWindow::~PluginUIWindow ()
 {
 }
+
 bool
 PluginUIWindow::on_key_press_event (GdkEventKey* event)
 {
-	return PublicEditor::instance().on_key_press_event(event);
+	if (!key_press_focus_accelerator_handler (*this, event)) {
+		return PublicEditor::instance().on_key_press_event(event);
+	} else {
+		return true;
+	}
 }
 
 bool
 PluginUIWindow::on_key_release_event (GdkEventKey* event)
 {
-	return PublicEditor::instance().on_key_release_event(event);
+	return true;
 }
 
 void