From 94d9593df86cea75bbc3dc62820c41efb65406ed Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sun, 9 Jun 2019 02:06:49 -0400
Subject: [PATCH] 3rd arg of TryToMakeActionAllows always == 2nd; eliminate it

---
 src/Menus.cpp                   | 14 +++++++-------
 src/Menus.h                     |  2 +-
 src/toolbars/ControlToolBar.cpp |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index 52bff34c6..51cec1825 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -900,7 +900,7 @@ bool MenuManager::ReportIfActionNotAllowed(
    const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd )
 {
    auto &project = mProject;
-   bool bAllowed = TryToMakeActionAllowed( flags, flagsRqd, flagsRqd );
+   bool bAllowed = TryToMakeActionAllowed( flags, flagsRqd );
    if( bAllowed )
       return true;
    auto &cm = CommandManager::Get( project );
@@ -913,7 +913,7 @@ bool MenuManager::ReportIfActionNotAllowed(
 /// If not, then try some recovery action to make it so.
 /// @return whether compatible or not after any actions taken.
 bool MenuManager::TryToMakeActionAllowed(
-   CommandFlag & flags, CommandFlag flagsRqd, CommandFlag mask )
+   CommandFlag & flags, CommandFlag flagsRqd )
 {
    auto &project = mProject;
    bool bAllowed;
@@ -921,19 +921,19 @@ bool MenuManager::TryToMakeActionAllowed(
    if( flags.none() )
       flags = GetUpdateFlags();
 
-   bAllowed = ((flags & mask) == (flagsRqd & mask));
+   bAllowed = ((flags & flagsRqd) == flagsRqd);
    if( bAllowed )
       return true;
 
    // Why is action not allowed?
    // 1's wherever a required flag is missing.
-   auto MissingFlags = (~flags & flagsRqd) & mask;
+   auto MissingFlags = (~flags & flagsRqd);
 
    if( mStopIfWasPaused && (MissingFlags & AudioIONotBusyFlag ).any() ){
       TransportActions::StopIfPaused( project );
       // Hope this will now reflect stopped audio.
       flags = GetUpdateFlags();
-      bAllowed = ((flags & mask) == (flagsRqd & mask));
+      bAllowed = ((flags & flagsRqd) == flagsRqd);
       if( bAllowed )
          return true;
    }
@@ -949,7 +949,7 @@ bool MenuManager::TryToMakeActionAllowed(
 
    // Why is action still not allowed?
    // 0's wherever a required flag is missing (or is don't care)
-   MissingFlags = (flags & ~flagsRqd) & mask;
+   MissingFlags = (flags & ~flagsRqd) & flagsRqd;
 
    // IF selecting all audio won't do any good, THEN return with failure.
    if( (flags & WaveTracksExistFlag).none() )
@@ -967,6 +967,6 @@ bool MenuManager::TryToMakeActionAllowed(
    // So changed to DoSelectAllAudio.
    SelectActions::DoSelectAllAudio(project);
    flags = GetUpdateFlags();
-   bAllowed = ((flags & mask) == (flagsRqd & mask));
+   bAllowed = ((flags & flagsRqd) == flagsRqd);
    return bAllowed;
 }
diff --git a/src/Menus.h b/src/Menus.h
index 6a6ab56ce..e92dd7d93 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -83,7 +83,7 @@ public:
    bool ReportIfActionNotAllowed(
       const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd );
    bool TryToMakeActionAllowed(
-      CommandFlag & flags, CommandFlag flagsRqd, CommandFlag mask );
+      CommandFlag & flags, CommandFlag flagsRqd );
 
 
 private:
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index adcd3ae9e..b455f28f4 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -1082,7 +1082,6 @@ bool ControlToolBar::DoRecord(AudacityProject &project,
    // NB: The call may have the side effect of changing flags.
    bool allowed = MenuManager::Get(project).TryToMakeActionAllowed(
       flags,
-      AudioIONotBusyFlag | CanStopAudioStreamFlag,
       AudioIONotBusyFlag | CanStopAudioStreamFlag);
 
    if (!allowed)