From 9b9a7beb130d183fc08a57927a3eaf4441be6809 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 22 Oct 2015 19:19:24 -0400
Subject: cleanup various merge conflict resolution errors/omissions

---
 gtk2_ardour/plugin_ui.cc | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'gtk2_ardour/plugin_ui.cc')

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
-- 
cgit v1.2.3