1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-02 08:59:28 +02:00

Fix status bar messages and disabling of pause button for scrubbing.

This commit is contained in:
Paul Licameli 2016-05-06 12:17:33 -04:00
parent 0d9d8a057d
commit 66454b7e4c

View File

@ -208,6 +208,12 @@ void Scrubber::MarkScrubStart(
ControlToolBar * const ctb = mProject->GetControlToolBar(); ControlToolBar * const ctb = mProject->GetControlToolBar();
ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub); ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub);
if(gAudioIO->IsPaused())
ctb->Pause(); // un-pause
// This disables the pause button.
ctb->EnableDisableButtons();
ctb->UpdateStatusBar(mProject); ctb->UpdateStatusBar(mProject);
CheckMenuItem(); CheckMenuItem();
@ -245,8 +251,11 @@ bool Scrubber::MaybeStartScrubbing(wxCoord xx)
); );
if (time1 != time0) if (time1 != time0)
{ {
if (busy) if (busy) {
auto position = mScrubStartPosition;
ctb->StopPlaying(); ctb->StopPlaying();
mScrubStartPosition = position;
}
AudioIOStartStreamOptions options(mProject->GetDefaultPlayOptions()); AudioIOStartStreamOptions options(mProject->GetDefaultPlayOptions());
options.timeTrack = NULL; options.timeTrack = NULL;