From e96edb8f2601edd05607fa18700cf815b4acc9e3 Mon Sep 17 00:00:00 2001 From: James Crook Date: Wed, 10 Aug 2016 19:17:40 +0100 Subject: [PATCH] Bug 1457 - Transport Menu "Scrub" and "Seek" do not correctly indicate when either Scrubbing mode is active --- src/tracks/ui/Scrubbing.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index 769c1fb39..7b29c988e 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -546,6 +546,7 @@ void Scrubber::StopScrubbing() } mProject->GetRulerPanel()->HideQuickPlayIndicator(); + CheckMenuItems(); } bool Scrubber::ShowsBar() const @@ -613,6 +614,8 @@ bool Scrubber::Seeks() const bool Scrubber::Scrubs() const { + if( Seeks() ) + return false; return (HasStartedScrubbing() || IsScrubbing()) && !ChoseSeeking(); } @@ -897,11 +900,13 @@ void Scrubber::OnScrubOrSeek(bool seek) void Scrubber::OnScrub(wxCommandEvent&) { OnScrubOrSeek(false); + CheckMenuItems(); } void Scrubber::OnSeek(wxCommandEvent&) { OnScrubOrSeek(true); + CheckMenuItems(); } void Scrubber::OnToggleScrubBar(wxCommandEvent&)