Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-22 15:20:15 +02:00
Code Issues Releases Wiki Activity

Bug 1492 - Using Scrub Ruler to start Scrub or then change to Seek removes the selection

Browse Source
This commit is contained in:
James Crook 2017-05-15 17:52:56 +01:00
parent b91160795d
commit bc55087968
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tracks/ui/Scrubbing.cpp
View File

@ -277,7 +277,11 @@ void Scrubber::MarkScrubStart(
ControlToolBar * const ctb = mProject->GetControlToolBar();
// Stop any play in progress
// Bug 1492: mCancelled to stop us collapsing the selected region.
mCancelled = true;
ctb->StopPlaying();
mCancelled = false;
// Usually the timer handler of TrackPanel does this, but we do this now,
// so that same timer does not StopPlaying() again after this function and destroy
// scrubber state
@ -495,7 +499,8 @@ void Scrubber::ContinueScrubbingUI()
if (mDragging && !state.LeftIsDown()) {
// Dragging scrub can stop with mouse up
// Stop and set cursor
mProject->DoPlayStopSelect(true, state.ShiftDown());
bool bShift = state.ShiftDown();
mProject->DoPlayStopSelect(true, bShift);
wxCommandEvent evt;
mProject->GetControlToolBar()->OnStop(evt);
return;
@ -538,7 +543,8 @@ void Scrubber::StopScrubbing()
if (HasStartedScrubbing() && !mCancelled) {
const wxMouseState state(::wxGetMouseState());
// Stop and set cursor
mProject->DoPlayStopSelect(true, state.ShiftDown());
bool bShift = state.ShiftDown();
mProject->DoPlayStopSelect(true, bShift);
}
mScrubStartPosition = -1;