Browse Source

Use wxMessageBox instead of ASSERT for duplicate hotkey warnings.

pull/15/head
Jeff Young 7 years ago
parent
commit
06d64c7883
  1. 9
      common/tool/action_manager.cpp

9
common/tool/action_manager.cpp

@ -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 );
}

Loading…
Cancel
Save