2 files changed, 8 insertions, 0 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index b9ab18af..26cd5795 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -1279,6 +1279,7 @@ void CClient::ProcessPacket(CNetChunk *pPacket)
 							m_aSnapshots[SNAP_CURRENT] = m_SnapshotStorage.m_pLast;
 							m_LocalStartTime = time_get();
 							SetState(IClient::STATE_ONLINE);
+							DemoRecorder_HandleAutoStart();
 						}
 
 						// adjust game time
@@ -1945,6 +1946,12 @@ void CClient::DemoRecorder_Start(const char *pFilename, bool WithTimestamp)
 	}
 }
 
+void CClient::DemoRecorder_HandleAutoStart()
+{
+	if(g_Config.m_ClAutoDemoRecord)
+		DemoRecorder_Start("autorecord", true);
+}
+
 void CClient::DemoRecorder_Stop()
 {
 	m_DemoRecorder.Stop();
diff --git a/src/engine/client/client.h b/src/engine/client/client.h
index 8cfd8c57..9299df05 100644
--- a/src/engine/client/client.h
+++ b/src/engine/client/client.h
@@ -285,6 +285,7 @@ public:
 
 	const char *DemoPlayer_Play(const char *pFilename, int StorageType);
 	void DemoRecorder_Start(const char *pFilename, bool WithTimestamp);
+	void DemoRecorder_HandleAutoStart();
 	void DemoRecorder_Stop();
 
 	virtual class CEngine *Engine() { return &m_Engine; }