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

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.
This commit is contained in:
Chris Pavlina 2015-09-07 16:04:16 -04:00 committed by Wayne Stambaugh
parent 168940158d
commit b55c074a11
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/hotkeys_basic.cpp
View File

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