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

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

Author: sagamusix
Date: Mon Jul  1 21:49:52 2024
New Revision: 21123
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21123

Log:
Merged revision(s) 21122 from trunk/OpenMPT:
[Fix] Key config dialog: Changing the category dropdown selection while "find hotkey" field was non-empty did not refresh the key list properly.
........

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	Mon Jul  1 21:49:33 2024	(r21122)
+++ branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Mon Jul  1 21:49:52 2024	(r21123)
@@ -366,9 +366,10 @@
 	if(cat < 0)
 		return;
 
+	const bool refresh = cat != m_curCategory || m_eFind.GetWindowTextLength() > 0 || m_eFindHotKey.GetWindowTextLength() > 0;
 	m_eFind.SetWindowText(_T(""));
-	m_eFindHotKey.SetWindowText(_T(""));
-	if(cat != m_curCategory)
+	OnClearHotKey();
+	if(refresh)
 	{
 		// Changed category
 		UpdateShortcutList(cat);