Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-12-13 08:06:32 +01:00
Code Issues Releases Wiki Activity

Allow same command more than once in the menus.

Browse Source 
Pause appears in both Record and Play, and we want the P shortcut to work.
This commit is contained in:
James Crook
2017-03-19 19:28:14 +00:00
parent 148fc40b78
commit 8f71aa67df
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/commands/CommandManager.cpp
View File

@@ -848,6 +848,14 @@ CommandListEntry *CommandManager::NewIdentifier(const wxString & name,
int index,
int count)
{
// If we have the identifier already, reuse it.
CommandListEntry *prev = mCommandNameHash[name];
if (!prev);
else if( prev->label != label );
else if( multi );
else
return prev;
{
// Make a unique_ptr or shared_ptr as appropriate:
auto entry = make_movable<CommandListEntry>();
@@ -918,7 +926,7 @@ CommandListEntry *CommandManager::NewIdentifier(const wxString & name,
mCommandIDHash[entry->id] = entry;
#if defined(__WXDEBUG__)
CommandListEntry *prev = mCommandNameHash[entry->name];
prev = mCommandNameHash[entry->name];
if (prev) {
// Under Linux it looks as if we may ask for a newID for the same command
// more than once. So it's only an error if two different commands