From b55c074a114cbf89e4030a5f4803a3524ec2606c Mon Sep 17 00:00:00 2001
From: Chris Pavlina <pavlina.chris@gmail.com>
Date: Mon, 7 Sep 2015 16:04:16 -0400
Subject: [PATCH] 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.
---
 common/hotkeys_basic.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/hotkeys_basic.cpp b/common/hotkeys_basic.cpp
index c0e3bc6b8e..40a4ffef39 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;
             }
         }