1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-16 08:34:10 +02:00

Bug1627 again: Fix it so that we don't disable all scrub, though!

This commit is contained in:
Paul Licameli 2017-07-21 02:12:05 -04:00
parent 57e040070c
commit 3e1890f20d

View File

@ -402,6 +402,14 @@ bool Scrubber::MaybeStartScrubbing(wxCoord xx)
mScrubToken =
ctb->PlayPlayRegion(SelectedRegion(time0, time1), options,
PlayMode::normalPlay, appearance, backwards);
if (mScrubToken <= 0) {
// Bug1627 (part of it):
// infinite error spew when trying to start scrub:
// If failed for reasons of audio device problems, do not try
// again with repeated timer ticks.
mScrubStartPosition = -1;
return false;
}
}
}
else
@ -421,14 +429,6 @@ bool Scrubber::MaybeStartScrubbing(wxCoord xx)
mPoller->Start(ScrubPollInterval_ms);
}
else if (mScrubToken <= 0) {
// Bug1627 (part of it):
// infinite error spew when trying to start scrub:
// If failed for reasons of audio device problems, do not try
// again with repeated timer ticks.
mScrubStartPosition = -1;
return false;
}
// Return true whether we started scrub, or are still waiting to decide.
return true;