summaryrefslogtreecommitdiff
path: root/gtk2_ardour/utils.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-09-16 22:11:50 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-09-16 22:11:50 -0400
commit5e0e41e068a04603198a4e50464d794156f42c47 (patch)
tree3b48cc9231ad71c0f0772b723379d9db56446ed5 /gtk2_ardour/utils.cc
parent045ef69ac37550cf376d40443555a57a931fe7b0 (diff)
parentc8b32e2f8bed225b8f5ceac130eea6632f595492 (diff)
Merge branch 'master' into cairocanvas
Diffstat (limited to 'gtk2_ardour/utils.cc')
-rw-r--r--gtk2_ardour/utils.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 0e9ca9f190..913d962831 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -345,12 +345,11 @@ relay_key_press (GdkEventKey* ev, Gtk::Window* win)
{
PublicEditor& ed (PublicEditor::instance());
- if (&ed == 0) {
- /* early key press in pre-main-window-dialogs, no editor yet */
- return false;
- }
-
if (!key_press_focus_accelerator_handler (*win, ev)) {
+ if (&ed == 0) {
+ /* early key press in pre-main-window-dialogs, no editor yet */
+ return false;
+ }
return ed.on_key_press_event(ev);
} else {
return true;