From cfdd05db69b018ac0effe5a3c9ea7fdd48826c91 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 6 May 2016 13:07:31 -0400
Subject: [PATCH] Pushbuttons work in scrub; click in numbers, QP disabled,
 does not stop scrub

---
 src/widgets/Ruler.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/widgets/Ruler.cpp b/src/widgets/Ruler.cpp
index 7e1fa0fec..f28a3a8e8 100644
--- a/src/widgets/Ruler.cpp
+++ b/src/widgets/Ruler.cpp
@@ -2281,8 +2281,12 @@ void AdornedRulerPanel::OnMouseEvents(wxMouseEvent &evt)
 
    auto &scrubber = mProject->GetScrubber();
    if (scrubber.HasStartedScrubbing()) {
-      if (zone == StatusChoice::EnteringQP &&
-          evt.LeftDown()) {
+      if (IsButton(zone))
+         // Fall through to pushbutton handling
+         ;
+      else if (zone == StatusChoice::EnteringQP &&
+               mQuickPlayEnabled &&
+               evt.LeftDown()) {
          // Stop scrubbing
          if (HasCapture())
             ReleaseMouse();