summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2015-04-01 14:01:21 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2015-04-01 14:01:21 -0400
commitf201b196041247c58d10b76f06d3e5768ad4fb98 (patch)
tree989cbf026dd85850a0ab097aceb4c435501e8511
parent57613dc0cc0d47b5eabeae45d369b8c221ea67f6 (diff)
reverse logic in ArdourWindow key handling
-rw-r--r--gtk2_ardour/ardour_window.cc13
1 files changed, 7 insertions, 6 deletions
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