haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use wxMessageBox instead of ASSERT for duplicate hotkey warnings.

This commit is contained in:
Jeff Young 2019-05-14 10:55:30 +01:00
parent e850592587
commit 06d64c7883
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/tool/action_manager.cpp
View File

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