diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-13 11:55:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-13 11:55:56 -0400 |
| commit | 4861eca97483128e5febb575b94688581abb0154 (patch) | |
| tree | 9893912806d7267a0086a94d4065d32663fe157b /gtk2_ardour/utils.cc | |
| parent | c985a64d5851634a77bc013a7f66ef8d9ccefcae (diff) | |
| parent | 83a826095deaddb90b8236a757c384aa6f120e71 (diff) | |
Merge branch 'master' into windows
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 28e0907f44..a35d171690 100644 --- a/gtk2_ardour/utils.cc +++ b/gtk2_ardour/utils.cc @@ -363,8 +363,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; } |