diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-16 22:11:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-16 22:11:06 -0400 |
| commit | fb45fdc052b23f4b2210c71a03a14bdb5986098a (patch) | |
| tree | b61c6331bc7699669834600c09dcf1dc3dccd109 /gtk2_ardour/utils.cc | |
| parent | 0da34e65e3470b1c2298ddf571df6356d0d42bd8 (diff) | |
| parent | c8b32e2f8bed225b8f5ceac130eea6632f595492 (diff) | |
fix conflicts and merge with master
Diffstat (limited to 'gtk2_ardour/utils.cc')
| -rw-r--r-- | gtk2_ardour/utils.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index a35d171690..bbce202ad1 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -365,12 +365,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; |