check for an existing PublicEditor instance AFTER attempting to handle a key press in a window that has called relay_key_press(), so that normal key handling works there (e.g. audio/MIDI setup)
This commit is contained in:
parent
710ee36eaa
commit
61b98d3e9f
@ -365,12 +365,11 @@ relay_key_press (GdkEventKey* ev, Gtk::Window* win)
|
|||||||
{
|
{
|
||||||
PublicEditor& ed (PublicEditor::instance());
|
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 (!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);
|
return ed.on_key_press_event(ev);
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user