diff options
author | David Robillard <d@drobilla.net> | 2008-02-17 17:49:38 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-02-17 17:49:38 +0000 |
commit | 8fed7470f5fb37ebd007410f4095851ba29ad2b4 (patch) | |
tree | 95edb188d98c6397ecd6be408f26524461270f85 /gtk2_ardour/editor_mouse.cc | |
parent | 859e9106e72a7908fa093d946111d148223225a0 (diff) |
Merge with 2.0-ongoing R3077.
git-svn-id: svn://localhost/ardour2/branches/3.0@3078 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_mouse.cc')
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index d4e6a4218f..eef83e819e 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -5246,7 +5246,7 @@ Editor::drag_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event) return; } - if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) { + if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier()) && Config->get_rubberbanding_snaps_to_grid()) { if (drag_info.first_move) { snap_to (drag_info.grab_frame); } |