From 4656913708a28eebf5e04bf63931a7cfea0c740d Mon Sep 17 00:00:00 2001 From: "james.k.crook@gmail.com" Date: Mon, 18 Jun 2012 13:19:57 +0000 Subject: [PATCH] Fix Bug 523: Names in prefs rather than numbers, so should be immune to renumbering bug. Fix Bug 517: Properly enable feature for Linux and Mac (changes were intended to be windows only, but some slipped through). --- src/commands/CommandManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index a6086faf5..fa44278f2 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -666,7 +666,8 @@ int CommandManager::NewIdentifier(wxString name, wxString label, wxMenu *menu, tmpEntry->defaultKey = tmpEntry->key; if( multi ) - name= name + wxString::Format(wxT("%d"),index ); + name= wxString::Format( wxT("%s:%s"), name.c_str(), label.c_str() ); + // + ":" + label;//wxString::Format(wxT("%d"),index ); tmpEntry->name = name; tmpEntry->label = label;