more transport button caironizing.

[ardour.git] / gtk2_ardour / ardour_window.cc

diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 808fcd9fd700ce2f6417afc1c1c90e1a4fa36aca..f6ced5fb492c7c7067fa0c6be4c97c9697a13a3f 100644 (file)
--- a/gtk2_ardour/ardour_window.cc
+++ b/gtk2_ardour/ardour_window.cc
@@ -58,14 +58,15 @@ ArdourWindow::~ArdourWindow ()
 bool
 ArdourWindow::on_key_press_event (GdkEventKey* ev)
 {
-       if (get_modal()) {
-               return Gtk::Window::on_key_press_event (ev);
-       }
+       bool handled = Gtk::Window::on_key_press_event (ev);
 
-       if (!relay_key_press (ev, this)) {
-               return Gtk::Window::on_key_press_event (ev);
+       if (!handled) {
+               if (!get_modal()) {
+                       handled = relay_key_press (ev, this);
+               }
        }
-       return true;
+
+       return handled;
 }
 
 bool