[OMPT-svn-commit] OpenMPT r22258 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Thu Nov 21 20:57:20 2024
New Revision: 22258
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22258

Log:
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.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp

Modified: branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Thu Nov 21 20:56:35 2024	(r22257)
+++ branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Thu Nov 21 20:57:20 2024	(r22258)
@@ -726,7 +726,7 @@
 	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())
 	{