From e8a07c61e2dc123dc53c204bac84df31e69f90d7 Mon Sep 17 00:00:00 2001 From: David Bailes Date: Wed, 26 Aug 2015 11:44:50 +0100 Subject: [PATCH] Fix for problem with the handling of default keystrokes. In the class CommandListEntry, the default key was being set to an empty string, rather than the correct key. This resulted in bugs such as: pressing default in keyboard preferences clearing all the shortcuts, entries being created in audacity.cfg for all commands with keystrokes, and ending up with commands with the same shortcut. --- src/commands/CommandManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index 0054b1857..c6956f265 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -856,10 +856,10 @@ CommandListEntry *CommandManager::NewIdentifier(const wxString & name, entry->id = wxID_ABOUT; #endif - entry->defaultKey = entry->key; entry->name = name; entry->label = label; entry->key = KeyStringNormalize(accel.BeforeFirst(wxT('\t'))); + entry->defaultKey = entry->key; entry->labelPrefix = labelPrefix; entry->labelTop = wxMenuItem::GetLabelText(mCurrentMenuName); entry->menu = menu;