Fixed key binds being deleted on disconnect

Author: ccw808

Client/core/CCommands.cpp

@@ -212,9 +212,13 @@ tagCOMMANDENTRY* CCommands::Get ( const char* szCommand, bool bCheckIfMod, bool
 {
     // Find the entry we're looking for
     auto iter = std::find_if(m_CommandList.begin(), m_CommandList.end(),
-        [szCommand](auto& command)
+        [szCommand, bCheckIfMod, bModCommand](auto& command)
     {
-        return stricmp(szCommand, command.szCommandName) == 0;
+        if ( !bCheckIfMod || ( bModCommand == command.bModCommand ) )
+        {
+            return stricmp(szCommand, command.szCommandName) == 0;
+        }
+        return false;
     });
 
     if (iter != m_CommandList.end())

Client/core/CKeyBinds.cpp

@@ -507,7 +507,7 @@ void CKeyBinds::RemoveDeletedBinds ( void )
 void CKeyBinds::ClearCommandsAndControls ( void )
 {
     m_List.remove_if([](auto& pBind) {
-        return pBind->GetType() == KEY_BIND_FUNCTION || pBind->GetType() == KEY_BIND_CONTROL_FUNCTION;
+        return pBind->GetType() != KEY_BIND_FUNCTION && pBind->GetType() != KEY_BIND_CONTROL_FUNCTION;
     });
 }
 
@@ -706,6 +706,10 @@ bool CKeyBinds::RemoveAllCommands ( void )
             return false;
         if (pBind->GetType() != KEY_BIND_COMMAND)
             return false;
+        if (m_bProcessingKeyStroke) {
+            pBind->beingDeleted = true;
+            return false;
+        }
         return true;
     });
     return bFound;
@@ -1610,7 +1614,7 @@ bool CKeyBinds::RemoveAllControlFunctions ( ControlFunctionBindHandler Handler )
         [&](auto& pBind) {
         if (pBind->IsBeingDeleted())
             return false;
-        if (pBind->GetType() == KEY_BIND_CONTROL_FUNCTION)
+        if (pBind->GetType() != KEY_BIND_CONTROL_FUNCTION)
             return false;
         CControlFunctionBind* pControlBind = static_cast<CControlFunctionBind*>(pBind.get());
         if (pControlBind->Handler != Handler)
@@ -1636,7 +1640,7 @@ bool CKeyBinds::RemoveAllControlFunctions ( void )
     [&](auto& pBind) {
         if (pBind->IsBeingDeleted())
             return false;
-        if (pBind->GetType() == KEY_BIND_CONTROL_FUNCTION)
+        if (pBind->GetType() != KEY_BIND_CONTROL_FUNCTION)
             return false;
         bFound = true;
 

Client/core/Settings/CBindSettingsTab.cpp

@@ -395,7 +395,7 @@ void CBindSettingsTab::Initialize(void)
                         for (int k = 0; k < SecKeyNum; k++)
                             m_pBindsList->SetItemText(iBind, m_hSecKeys[k], CORE_SETTINGS_NO_KEY);
                         m_pBindsList->SetItemData(iBind, m_hBind, (void*)KEY_BIND_GTA_CONTROL);
-                        m_pBindsList->SetItemData(iBind, m_hPriKey, (void*)&pGTABind);
+                        m_pBindsList->SetItemData(iBind, m_hPriKey, (void*)pGTABind);
                         iGameRowCount++;
                     }
                     // Secondary keys?
@@ -404,7 +404,7 @@ void CBindSettingsTab::Initialize(void)
                             if (uiMatchCount == k + 1)
                             {
                                 m_pBindsList->SetItemText(iBind, m_hSecKeys[k], pGTABind->boundKey->szKey);
-                                m_pBindsList->SetItemData(iBind, m_hSecKeys[k], (void*)&pGTABind);
+                                m_pBindsList->SetItemData(iBind, m_hSecKeys[k], (void*)pGTABind);
                             }
                     uiMatchCount++;
                 }
@@ -460,7 +460,7 @@ void CBindSettingsTab::Initialize(void)
                                 if (pListedCommand->uiMatchCount == k)
                                 {
                                     m_pBindsList->SetItemText(pListedCommand->iIndex, m_hSecKeys[k], pCommandBind->boundKey->szKey);
-                                    m_pBindsList->SetItemData(pListedCommand->iIndex, m_hSecKeys[k], (void*)&pCommandBind);
+                                    m_pBindsList->SetItemData(pListedCommand->iIndex, m_hSecKeys[k], (void*)pCommandBind);
                                 }
                             pListedCommand->uiMatchCount++;
                         }