Use wxMessageBox instead of ASSERT for duplicate hotkey warnings.
This commit is contained in:
parent
e850592587
commit
06d64c7883
|
@ -213,7 +213,8 @@ void ACTION_MANAGER::UpdateHotKeys()
|
||||||
{
|
{
|
||||||
// Users are free to define colliding hotkeys, but we want to know if
|
// Users are free to define colliding hotkeys, but we want to know if
|
||||||
// our default set has any collisions.
|
// our default set has any collisions.
|
||||||
wxFAIL_MSG( wxString::Format( "Duplicate hotkey definitions for %s: %s and %s",
|
wxMessageBox( wxString::Format(
|
||||||
|
"Duplicate hotkey definitions for '%s': %s and %s",
|
||||||
KeyNameFromKeyCode( hotkey ),
|
KeyNameFromKeyCode( hotkey ),
|
||||||
actionName.first,
|
actionName.first,
|
||||||
m_actionHotKeys[hotkey].front()->GetName() ) );
|
m_actionHotKeys[hotkey].front()->GetName() ) );
|
||||||
|
|
Loading…
Reference in New Issue