X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_window.cc;h=f6ced5fb492c7c7067fa0c6be4c97c9697a13a3f;hb=c9f9bb263fc3f96e383216d515c62ac6706b56da;hp=808fcd9fd700ce2f6417afc1c1c90e1a4fa36aca;hpb=57613dc0cc0d47b5eabeae45d369b8c221ea67f6;p=ardour.git

diff --git a/gtk2_ardour/ardour_window.cc b/gtk2_ardour/ardour_window.cc
index 808fcd9fd7..f6ced5fb49 100644
--- 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