From 5954f15989235e28efdac25688215cf8d3fa140c Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Thu, 22 Aug 2013 21:45:42 -0400 Subject: [PATCH] Fixed crash in OnSayCommand_Post with console chat, pass console chat (bug 5864, r=voided); --HG-- extra : rebase_source : 4a1a1945efc119f40e7d55d4fdfcc250bdc0febc --- core/ChatTriggers.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/ChatTriggers.cpp b/core/ChatTriggers.cpp index fba3d264..a64891d4 100644 --- a/core/ChatTriggers.cpp +++ b/core/ChatTriggers.cpp @@ -333,11 +333,8 @@ void ChatTriggers::OnSayCommand_Post() { int client = g_ConCmds.GetCommandClient(); - if (m_bWillProcessInPost) + if (m_bWillProcessInPost && client > 0) { - /* Reset this for re-entrancy */ - m_bWillProcessInPost = false; - /* Execute the cached command */ unsigned int old = SetReplyTo(SM_REPLY_CHAT); #if SOURCE_ENGINE == SE_DOTA @@ -348,6 +345,9 @@ void ChatTriggers::OnSayCommand_Post() SetReplyTo(old); } + /* Reset this for re-entrancy */ + m_bWillProcessInPost = false; + if (m_bPluginIgnored) { m_bPluginIgnored = false;