From 300d03eb85472b6b05dd805cca9fb39434cfd216 Mon Sep 17 00:00:00 2001
From: Garey Akhmetshin <garey@csgo.com>
Date: Sun, 14 Feb 2021 23:23:28 +0500
Subject: [PATCH] -Remove delay in recording demos. -Stop demo after new world
 is appear.

---
 rehlds/HLTV/Proxy/src/DemoClient.cpp |  7 ++++++-
 rehlds/HLTV/Proxy/src/Proxy.cpp      | 18 ++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/rehlds/HLTV/Proxy/src/DemoClient.cpp b/rehlds/HLTV/Proxy/src/DemoClient.cpp
index 5d48cd1..42d8e07 100644
--- a/rehlds/HLTV/Proxy/src/DemoClient.cpp
+++ b/rehlds/HLTV/Proxy/src/DemoClient.cpp
@@ -157,6 +157,11 @@ void DemoClient::RunFrame(double time)
 
 void DemoClient::SendDatagram()
 {
+#ifndef HLTV_FIXES
+	/*
+	 * Delaying frames to demo is wrong.
+	 * Early stopping demo will lost server frames.
+	 */
 	if (m_Proxy->GetDelay() > 0)
 	{
 		double worldTime = m_Proxy->GetSpectatorTime();
@@ -173,7 +178,7 @@ void DemoClient::SendDatagram()
 
 		return;
 	}
-
+#endif
 	frame_t *frame = m_World->GetLastFrame();
 	if (frame) {
 		WriteDatagram(frame->time, frame);
diff --git a/rehlds/HLTV/Proxy/src/Proxy.cpp b/rehlds/HLTV/Proxy/src/Proxy.cpp
index 277971b..5aed7ad 100644
--- a/rehlds/HLTV/Proxy/src/Proxy.cpp
+++ b/rehlds/HLTV/Proxy/src/Proxy.cpp
@@ -106,6 +106,11 @@ void Proxy::AddNextWorld()
 	if (m_Server->IsConnected()) {
 		m_Server->Reconnect();
 	}
+	if (m_DemoClient.IsActive())
+	{
+		m_DemoClient.Reconnect();
+		m_DemoClient.SetWorld(nextWorld);
+	}
 }
 #endif
 bool Proxy::Init(IBaseSystem *system, int serial, char *name)
@@ -345,18 +350,7 @@ void Proxy::RunFrame(double time)
 					// We can't RemoveModule m_World right now because it will fire events to unload us.
 					// Store it in temp var to unload it after set new world
 					IWorld* oldWorld = m_World;
-					m_World = head;					
-					if (m_DemoClient.IsActive())
-					{
-						m_DemoClient.Disconnect("End of Record");
-						m_DemoClient.SetProxy(this);
-						m_DemoClient.SetWorld(m_World);
-						if (m_DemoClient.Connect())
-						{
-							m_DemoClient.SetUpdateRate(m_MaxUpdateRate);
-							m_DemoClient.SetRate(m_MaxRate);
-						}
-					}
+					m_World = head;	
 					m_Worlds.RemoveHead();
 					NewGameStarted();
 					ReconnectClients();