diff --git a/src/Menus.cpp b/src/Menus.cpp index 061e76623..52bff34c6 100644 --- a/src/Menus.cpp +++ b/src/Menus.cpp @@ -897,14 +897,14 @@ void MenuCreator::RebuildAllMenuBars() } bool MenuManager::ReportIfActionNotAllowed( - const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd, CommandFlag mask ) + const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd ) { auto &project = mProject; - bool bAllowed = TryToMakeActionAllowed( flags, flagsRqd, mask ); + bool bAllowed = TryToMakeActionAllowed( flags, flagsRqd, flagsRqd ); if( bAllowed ) return true; auto &cm = CommandManager::Get( project ); - cm.TellUserWhyDisallowed( Name, flags & mask, flagsRqd & mask); + cm.TellUserWhyDisallowed( Name, flags & flagsRqd, flagsRqd); return false; } diff --git a/src/Menus.h b/src/Menus.h index 46840d0b1..6a6ab56ce 100644 --- a/src/Menus.h +++ b/src/Menus.h @@ -81,8 +81,7 @@ public: // Command Handling bool ReportIfActionNotAllowed( - const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd, - CommandFlag mask ); + const wxString & Name, CommandFlag & flags, CommandFlag flagsRqd ); bool TryToMakeActionAllowed( CommandFlag & flags, CommandFlag flagsRqd, CommandFlag mask ); diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index 2d1016103..76a6eb1b9 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -1271,7 +1271,7 @@ bool CommandManager::HandleCommandEntry(const CommandListEntry * entry, // NB: The call may have the side effect of changing flags. bool allowed = MenuManager::Get(*proj).ReportIfActionNotAllowed( - NiceName, flags, entry->flags, entry->flags ); + NiceName, flags, entry->flags ); // If the function was disallowed, it STILL should count as having been // handled (by doing nothing or by telling the user of the problem). // Otherwise we may get other handlers having a go at obeying the command. diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index 4090cd362..bb22da2a2 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -3278,7 +3278,6 @@ void EffectUIHost::OnApply(wxCommandEvent & evt) MenuManager::Get(*mProject).ReportIfActionNotAllowed( mEffect->GetTranslatedName(), flags, - WaveTracksSelectedFlag | TimeSelectedFlag, WaveTracksSelectedFlag | TimeSelectedFlag); if (!allowed) return;