diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/utils.cc | |
parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/utils.cc')
-rw-r--r-- | gtk2_ardour/utils.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc index fce1d0b46c..0e9ca9f190 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -343,8 +343,15 @@ set_color (Gdk::Color& c, int rgb) bool 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)) { - return PublicEditor::instance().on_key_press_event(ev); + return ed.on_key_press_event(ev); } else { return true; } |