Changeset 835 for trunk/KeyComboDlg.cpp

Timestamp:

1/2/2009 5:35:27 AM (4 years ago)

Author:

lowjoel

Message:

Fixed the Hotkey selection dialog. The old code did not allow a trailing NULL to be returned, preventing the GetLine? call from succeeding. I've now added space for it and added error handling code.

Fixes #130.

File:

• trunk/KeyComboDlg.cpp (modified) (4 diffs)

trunk/KeyComboDlg.cpp

@@ -72 +72 @@
 void CKeyComboDlg::OnBnClickedOk()
 {
-    char ch[10];    
-    m_eKey.GetLine(0,ch,1);
-    m_strValue = ch;
+    char ch[8]; 
+    memset(ch, 0, sizeof(ch));
+    if (m_eKey.GetLine(0, ch, sizeof(ch)))
+    {
+        m_strValue = ch[0];
+        m_strValue.MakeUpper();
+    }
+
     OnOK();
 }
@@ -82 +87 @@
     CDialog::OnActivate(nState, pWndOther, bMinimized);
     m_eKey.SetFocus();
-    // TODO: Add your message handler code here
 }
 
@@ -92 +96 @@
     // function and call CRichEditCtrl().SetEventMask()
     // with the ENM_CHANGE flag ORed into the mask.
-    char ch[10];
-    m_eKey.GetLine(0,ch,1);
-    CString strLine(ch);
+
+    //Recursion guard
     static bool busy = false;
     if (busy)
@@ -100 +103 @@
     busy = true;
 
+    char ch[8];
+    memset(ch, 0, sizeof(ch));
+    if (!m_eKey.GetLine(0, ch, sizeof(ch)))
+        return;
+
+    CString strLine(ch);
+    strLine.MakeUpper();
     if (!strLine.Trim().IsEmpty())
     {
         CString strTmp(m_strRegKey.MakeUpper());
-        strLine.MakeUpper();
         if (strTmp.Find(strLine[0]) == -1) {
             //Invalid selection, clear the entry
-            m_eKey.SetWindowText("m");
+            m_eKey.Undo();
 
             //TODO: This works only with XP/Vista. What about others?