From c99d2df05db687ea48ff9a2eef32507b2dfc78fb Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 18 Apr 2016 01:47:30 -0400
Subject: [PATCH] ESC key stops scrubbing

---
 src/TrackPanel.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index ffbd66bf7..7f448b268 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -1150,7 +1150,10 @@ void TrackPanel::HandleEscapeKey(bool down)
    if (!down)
       return;
 
-   switch (mMouseCapture)
+   auto &scrubber = GetProject()->GetScrubber();
+   if(scrubber.IsScrubbing())
+      scrubber.StopScrubbing();
+   else switch (mMouseCapture)
    {
    case IsSelecting:
    {