about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/game/client/components/chat.cpp3
-rw-r--r--src/game/client/components/emoticon.cpp4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/game/client/components/chat.cpp b/src/game/client/components/chat.cpp
index 167fe181..d082bf78 100644
--- a/src/game/client/components/chat.cpp
+++ b/src/game/client/components/chat.cpp
@@ -100,6 +100,9 @@ bool CChat::OnInput(IInput::CEvent e)
 
 void CChat::EnableMode(int Team)
 {
+	if(Client()->State() == IClient::STATE_DEMOPLAYBACK)
+		return;
+
 	if(m_Mode == MODE_NONE)
 	{
 		if(Team)
diff --git a/src/game/client/components/emoticon.cpp b/src/game/client/components/emoticon.cpp
index 6d03f88d..cb54dbcd 100644
--- a/src/game/client/components/emoticon.cpp
+++ b/src/game/client/components/emoticon.cpp
@@ -16,7 +16,9 @@ CEmoticon::CEmoticon()
 
 void CEmoticon::ConKeyEmoticon(IConsole::IResult *pResult, void *pUserData)
 {
-	((CEmoticon *)pUserData)->m_Active = pResult->GetInteger(0) != 0;
+	CEmoticon *pSelf = (CEmoticon *)pUserData;
+	if(pSelf->Client()->State() != IClient::STATE_DEMOPLAYBACK)
+		((CEmoticon *)pUserData)->m_Active = pResult->GetInteger(0) != 0;
 }
 
 void CEmoticon::ConEmote(IConsole::IResult *pResult, void *pUserData)