smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 23:35:03 +01:00
Code Issues Projects Releases Wiki Activity

fix conflicts and merge with master

Browse source
This commit is contained in:
Paul Davis 2013-09-16 22:11:06 -04:00
commit fb45fdc052
10 changed files with 294 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/utils.cc
View file

@ -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;