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

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

Author: sagamusix
Date: Tue Nov 12 19:01:02 2024
New Revision: 22169
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22169

Log:
Merged revision(s) 22168 from trunk/OpenMPT:
[Fix] Keyboard config: Don't allow shortcut editor to become active by double-clicking when no valid shortcut is selected.
........

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	Tue Nov 12 19:00:41 2024	(r22168)
+++ branches/OpenMPT-1.31/mptrack/KeyConfigDlg.cpp	Tue Nov 12 19:01:02 2024	(r22169)
@@ -542,9 +542,9 @@
 	{
 		m_cmbKeyChoice.SetWindowText(_T(""));
 		m_eCustHotKey.SetWindowText(_T(""));
-		m_bKeyDown.SetCheck(0);
-		m_bKeyHold.SetCheck(0);
-		m_bKeyUp.SetCheck(0);
+		m_bKeyDown.SetCheck(BST_UNCHECKED);
+		m_bKeyHold.SetCheck(BST_UNCHECKED);
+		m_bKeyUp.SetCheck(BST_UNCHECKED);
 		m_curCommand = kcNull;
 	}
 
@@ -587,9 +587,9 @@
 		m_curKeyChoice = choice;
 		m_forceUpdate = true;
 		m_eCustHotKey.SetKey(ModNone, 0);
-		m_bKeyDown.SetCheck(0);
-		m_bKeyHold.SetCheck(0);
-		m_bKeyUp.SetCheck(0);
+		m_bKeyDown.SetCheck(BST_UNCHECKED);
+		m_bKeyHold.SetCheck(BST_UNCHECKED);
+		m_bKeyUp.SetCheck(BST_UNCHECKED);
 		return;
 	}
 
@@ -664,7 +664,7 @@
 	ClientToScreen(&point);
 	CRect rect;
 	m_eCustHotKey.GetWindowRect(rect);
-	if(m_eCustHotKey.IsBypassed() && rect.PtInRect(point))
+	if(m_curCommand != kcNull && m_eCustHotKey.IsBypassed() && rect.PtInRect(point))
 		EnableKeyChoice(true);
 	else
 		CPropertyPage::OnLButtonDblClk(flags, point);