From 8dab37de019fa0b33556cda43a14fc1676d57a29 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 6 Jun 2016 00:48:50 -0400
Subject: [PATCH] Scrub menu check items change pushed state of scrub toolbar
 buttons

---
 src/Project.cpp             | 8 ++++++++
 src/Project.h               | 2 ++
 src/tracks/ui/Scrubbing.cpp | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/src/Project.cpp b/src/Project.cpp
index e52a0805d..271078dab 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -4370,6 +4370,14 @@ MixerToolBar *AudacityProject::GetMixerToolBar()
            NULL);
 }
 
+ScrubbingToolBar *AudacityProject::GetScrubbingToolBar()
+{
+   return dynamic_cast<ScrubbingToolBar*>
+   (mToolManager ?
+    mToolManager->GetToolBar(ScrubbingBarID) :
+    nullptr);
+}
+
 SelectionBar *AudacityProject::GetSelectionBar()
 {
    return (SelectionBar *)
diff --git a/src/Project.h b/src/Project.h
index c31019e8f..74cb4e54e 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -75,6 +75,7 @@ class EditToolBar;
 class MeterToolBar;
 class MixerToolBar;
 class Scrubber;
+class ScrubbingToolBar;
 class SelectionBar;
 class SpectralSelectionBar;
 class Toolbar;
@@ -442,6 +443,7 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame,
    DeviceToolBar *GetDeviceToolBar();
    EditToolBar *GetEditToolBar();
    MixerToolBar *GetMixerToolBar();
+   ScrubbingToolBar *GetScrubbingToolBar();
    SelectionBar *GetSelectionBar();
 #ifdef EXPERIMENTAL_SPECTRAL_EDITING
    SpectralSelectionBar *GetSpectralSelectionBar();
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 5120a004e..0bc64307c 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -21,6 +21,7 @@ Paul Licameli split from TrackPanel.cpp
 #include "../../commands/CommandFunctors.h"
 #include "../../prefs/PlaybackPrefs.h"
 #include "../../toolbars/ControlToolBar.h"
+#include "../../toolbars/EditToolBar.h"
 
 #undef USE_TRANSCRIPTION_TOOLBAR
 #ifdef USE_TRANSCRIPTION_TOOLBAR
@@ -787,6 +788,9 @@ void Scrubber::OnScrubOrSeek(bool &toToggle, bool &other)
       // Update button images
       ruler->UpdateButtonStates();
 
+   auto scrubbingToolBar = mProject->GetScrubbingToolBar();
+   scrubbingToolBar->EnableDisableButtons();
+
    CheckMenuItem();
 }