ignore context menu click events, notably during drag but also for a couple of other purposes

Conflicts:
	gtk2_ardour/editor_canvas_events.cc

1 files changed, 18 insertions, 14 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 27d538a527..e17ddfb41e 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -1191,20 +1191,24 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 		return true;
 	}
 
-	/* see if we're finishing a drag */
-
-	bool were_dragging = false;
-	if (_drags->active ()) {
-		bool const r = _drags->end_grab (event);
-		if (r) {
-			/* grab dragged, so do nothing else */
-			return true;
-		}
-
-		were_dragging = true;
-	}
-
-	update_region_layering_order_editor ();
+        bool were_dragging = false;
+
+	if (!Keyboard::is_context_menu_event (&event->button)) {
+
+                /* see if we're finishing a drag */
+                
+                if (_drags->active ()) {
+                        bool const r = _drags->end_grab (event);
+                        if (r) {
+                                /* grab dragged, so do nothing else */
+                                return true;
+                        }
+                        
+                        were_dragging = true;
+                }
+
+                update_region_layering_order_editor ();
+        }
 
 	/* edit events get handled here */