|
|
@ -213,10 +213,11 @@ void ACTION_MANAGER::UpdateHotKeys() |
|
|
|
{ |
|
|
|
// Users are free to define colliding hotkeys, but we want to know if
|
|
|
|
// our default set has any collisions.
|
|
|
|
wxFAIL_MSG( wxString::Format( "Duplicate hotkey definitions for %s: %s and %s", |
|
|
|
KeyNameFromKeyCode( hotkey ), |
|
|
|
actionName.first, |
|
|
|
m_actionHotKeys[hotkey].front()->GetName() ) ); |
|
|
|
wxMessageBox( wxString::Format( |
|
|
|
"Duplicate hotkey definitions for '%s': %s and %s", |
|
|
|
KeyNameFromKeyCode( hotkey ), |
|
|
|
actionName.first, |
|
|
|
m_actionHotKeys[hotkey].front()->GetName() ) ); |
|
|
|
|
|
|
|
it = m_actionHotKeys[hotkey].erase( it ); |
|
|
|
} |
|
|
|