Merged with trunk R1141

[ardour.git] / gtk2_ardour / plugin_ui.cc

diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc
index b19a9f74ebeddb6f57f62544c9ae377f828392be..56b9e34d35b5b19e48e9ecd575851369b51fb93b 100644 (file)
--- 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