From 8339850e1409ed7285c0cf7aa8a6d4651f93d5d1 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 6 Dec 2014 16:05:47 -0500
Subject: [PATCH] Fix patch flag scroll theft when in normal mode.

---
 gtk2_ardour/patch_change.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index 8943981f09..ce9bb0a142 100644
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -158,9 +158,14 @@ PatchChange::event_handler (GdkEvent* ev)
 	/* XXX: icky dcast */
 	Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
 
+	if (!e->internal_editing()) {
+		// not in internal edit mode, so no patch change editing
+		return false;
+	}
+
 	switch (ev->type) {
 	case GDK_BUTTON_PRESS:
-		if (e->current_mouse_mode() == Editing::MouseObject && e->internal_editing()) {
+		if (e->current_mouse_mode() == Editing::MouseObject) {
 
 			if (Gtkmm2ext::Keyboard::is_delete_event (&ev->button)) {