From 3e1890f20d25dcbd88d23d2df8871909133c9f45 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 21 Jul 2017 02:12:05 -0400
Subject: [PATCH] Bug1627 again: Fix it so that we don't disable all scrub,
 though!

---
 src/tracks/ui/Scrubbing.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 17a0c32d9..c40acf8b4 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -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;