From 06d64c7883805d58656ba00ac29cae16ff0c2e5a Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Tue, 14 May 2019 10:55:30 +0100 Subject: [PATCH] Use wxMessageBox instead of ASSERT for duplicate hotkey warnings. --- common/tool/action_manager.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/common/tool/action_manager.cpp b/common/tool/action_manager.cpp index ad41fa344f..ee4b65af3d 100644 --- a/common/tool/action_manager.cpp +++ b/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 ); }