diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-22 19:19:24 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
commit | 9b9a7beb130d183fc08a57927a3eaf4441be6809 (patch) | |
tree | 2857fa4cdf41c3949d262634fbff8af9ac6f95f0 /gtk2_ardour/plugin_ui.cc | |
parent | ec65e351acea329de1d09b8ce518a023001dfdab (diff) |
cleanup various merge conflict resolution errors/omissions
Diffstat (limited to 'gtk2_ardour/plugin_ui.cc')
-rw-r--r-- | gtk2_ardour/plugin_ui.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index 87c0202836..d351e5efba 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -58,6 +58,7 @@ #endif #include "ardour_window.h" +#include "ardour_ui.h" #include "prompter.h" #include "plugin_ui.h" #include "utils.h" @@ -361,27 +362,26 @@ PluginUIWindow::on_key_press_event (GdkEventKey* event) } } return true; - } else { - /* for us to be getting key press events, there really - MUST be a _pluginui, but just to be safe, check ... - */ - - if (_pluginui) { - _pluginui->grab_focus(); - if (_pluginui->non_gtk_gui()) { - /* pass main window as the window for the event - to be handled in, not this one, because there are - no widgets in this window that we want to have - key focus. - */ - return relay_key_press (event, &ARDOUR_UI::instance()->main_window()); - } else { - return relay_key_press (event, this); - } + } + /* for us to be getting key press events, there really + MUST be a _pluginui, but just to be safe, check ... + */ + + if (_pluginui) { + _pluginui->grab_focus(); + if (_pluginui->non_gtk_gui()) { + /* pass main window as the window for the event + to be handled in, not this one, because there are + no widgets in this window that we want to have + key focus. + */ + return relay_key_press (event, &ARDOUR_UI::instance()->main_window()); } else { - return false; + return relay_key_press (event, this); } - } + } + + return false; } bool |