From 71dadc9b791876e29d3dd3df7dd5381bf8c503c3 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Thu, 21 Apr 2016 13:07:41 -0400
Subject: [PATCH] Bug1052 again:  Push play button and change its image as soon
 as scrub click.

---
 src/tracks/ui/Scrubbing.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 77529673e..bf04b9ba2 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -155,6 +155,7 @@ void Scrubber::MarkScrubStart(
    mScrubStartClockTimeMillis = ::wxGetLocalTimeMillis();
 
    ControlToolBar * const ctb = mProject->GetControlToolBar();
+   ctb->SetPlay(true, ControlToolBar::PlayAppearance::Scrub);
    ctb->UpdateStatusBar(mProject);
    mProject->GetTrackPanel()->HandleCursor(event);
 }
@@ -312,17 +313,18 @@ void Scrubber::StopScrubbing()
 {
    mScrubStartPosition = -1;
    mSmoothScrollingScrub = false;
+   const auto ctb = mProject->GetControlToolBar();
 
    if (IsScrubbing())
    {
       if (gAudioIO->IsBusy()) {
-         ControlToolBar *const ctb = mProject->GetControlToolBar();
          ctb->StopPlaying();
       }
-      return;
    }
-   else
-      return;
+   else {
+      // Didn't really play, but did change button apperance
+      ctb->SetPlay(false, ControlToolBar::PlayAppearance::Straight);
+   }
 }
 
 bool Scrubber::IsScrubbing() const