kicad-developers team mailing list archive

[Chris Pavlina <pavlina.chris@xxxxxxxxx>]

Has this been seen?

On Fri, Aug 28, 2015 at 10:05:32PM -0400, Chris Pavlina wrote:
> 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 patch interprets unassigned hotkeys correctly, 
> disabling them.
> 
> --
> Chris

> commit dd5a3527c1a2c5b81d2a12dc5e579b1c9a00a37c
> Author: Chris Pavlina <cpavlin1@xxxxxxxxxxxxxx>
> Date:   Fri Aug 28 22:02:31 2015 -0400
> 
>     Fix: interpret unassigned hotkey correctly
> 
> diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
> index c0e3bc6..40a4ffe 100644
> --- a/common/hotkeys_basic.cpp
> +++ b/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;
>              }
>          }