From e94338295344a797f52ac8118a271a4da73e8b34 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 7 Jun 2015 17:05:59 -0400 Subject: [PATCH] Bug1014: Do not change the cursor for selection adjustment while scrubbing. (Cursor may still change to the "forbidden" symbol at a boundary between clips.) --- src/TrackPanel.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp index c88df224d..209eff2ff 100644 --- a/src/TrackPanel.cpp +++ b/src/TrackPanel.cpp @@ -1950,8 +1950,11 @@ void TrackPanel::SetCursorAndTipWhenSelectTool( Track * t, // If not shift-down and not snapping center, then // choose boundaries only in snapping tolerance, - // and may choose center - SelectionBoundary boundary = ChooseBoundary(event, t, r, !bShiftDown, !bShiftDown); + // and may choose center. + // But don't change the cursor when scrubbing. + SelectionBoundary boundary = IsScrubbing() + ? SBNone + : ChooseBoundary(event, t, r, !bShiftDown, !bShiftDown); #ifdef USE_MIDI // The MIDI HitTest will only succeed if we are on a midi track, so