Snap-to-grid should not invalidate other snap options. This was a leftover behavior...

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 9fda261113febd6af23ff1931485f81d447ca4dc..04d6a72ec751edb8f6fce1d60090bff67b557fbf 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2869,11 +2869,6 @@ Editor::snap_to_internal (MusicSample& start, RoundMode direction, SnapPref pref
 
        /* check Grid */
        if (UIConfiguration::instance().get_snap_to_grid() && (_grid_type != GridTypeNone)) {
-
-               /* if SnapToGrid is selected, the user wants to prioritize the music grid
-                * in this case we should reset the best distance, so Grid will prevail */
-               dist = max_samplepos;
-
                test = snap_to_grid (grid_marks, presnap, direction);
                check_best_snap(presnap, test, dist, best);
        }