summaryrefslogtreecommitdiff
path: root/gtk2_ardour/midi_region_view.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gtk2_ardour/midi_region_view.cc')
-rw-r--r--gtk2_ardour/midi_region_view.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index c0da287180..4212a3131c 100644
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -337,7 +337,12 @@ MidiRegionView::canvas_event(GdkEvent* ev)
}
if (ev->type == GDK_2BUTTON_PRESS) {
- return trackview.editor().toggle_internal_editing_from_double_click (ev);
+ // cannot use double-click to exit internal mode if single-click is being used
+ MouseMode m = trackview.editor().current_mouse_mode();
+
+ if ((m != MouseObject || !Keyboard::modifier_state_contains (ev->button.state, Keyboard::insert_note_modifier())) && (m != MouseDraw)) {
+ return trackview.editor().toggle_internal_editing_from_double_click (ev);
+ }
}
if ((!trackview.editor().internal_editing() && trackview.editor().current_mouse_mode() != MouseGain) ||