Browse Source

Interpret unassigned hotkeys correctly.

* If a hotkey is set to "unassigned" (typically by causing a conflict), it 
  is not loaded correctly. The loader interprets "unassigned" as "keep the 
  default assignment", which leads to a conflict later that causes an 
  assertion failure.
pull/7/head
Chris Pavlina 10 years ago
committed by Wayne Stambaugh
parent
commit
b55c074a11
  1. 6
      common/hotkeys_basic.cpp

6
common/hotkeys_basic.cpp

@ -732,11 +732,7 @@ void ParseHotkeyConfig( const wxString& data,
if( hk_decr->m_InfoMsg == fctname )
{
int code = KeyCodeFromKeyName( keyname );
if( code )
hk_decr->m_KeyCode = code;
hk_decr->m_KeyCode = KeyCodeFromKeyName( keyname );
break;
}
}

Loading…
Cancel
Save