Merged revision(s) 22257 from trunk/OpenMPT:

[Fix] Key Config: When changing a shortcut via a search that had results in multiple contexts, a wrong context could be assigned to the shortcut.
........


git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@22258 56274372-70c3-4bfc-bfc3-4c3a0b034d27

mptrack/KeyConfigDlg.cpp

@@ -726,7 +726,7 @@ void COptionsKeyboard::OnSetKeyChoice()
 	if(m_bKeyUp.GetCheck() != BST_UNCHECKED)
 		event |= kKeyEventUp;
 
-	KeyCombination kc((commandCategories[m_curCategory]).id, m_eCustHotKey.mod, m_eCustHotKey.code, event);
+	KeyCombination kc((commandCategories[GetCategoryFromCommandID(cmd)]).id, m_eCustHotKey.mod, m_eCustHotKey.code, event);
 	//detect invalid input
 	if(!kc.KeyCode())
 	{