From 66454b7e4c02ed9e9aacd4ed8786f8cac2dd9e63 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 6 May 2016 12:17:33 -0400
Subject: [PATCH] Fix status bar messages and disabling of pause button for
 scrubbing.

---
 src/tracks/ui/Scrubbing.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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