From f8f5a18d675be3284170bf2900ec2194b0e2d33c Mon Sep 17 00:00:00 2001
From: Asher Baker <asherkin@limetech.io>
Date: Sun, 18 Jul 2021 19:08:36 +0100
Subject: [PATCH] Fix vprof crashing in some games (#1541)

Some engines are very sensitive to exactly when in a frame vprof is
enabled, the vprof commands use a special command registration method
to defer their execution to the start of the next frame. Instead of
starting/stopping vprof directly ourselves, use the built-in commands
to ensure that the timing is correct and the server does not crash.

Fixes #1162
---
 core/vprof_tool.cpp | 21 +++++++++++++--------
 core/vprof_tool.h   |  5 -----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/core/vprof_tool.cpp b/core/vprof_tool.cpp
index 8d54856d..110025ec 100644
--- a/core/vprof_tool.cpp
+++ b/core/vprof_tool.cpp
@@ -36,11 +36,6 @@
 
 VProfTool sVProfTool;
 
-VProfTool::VProfTool()
-	: active_(false)
-{
-}
-
 void
 VProfTool::OnSourceModAllInitialized()
 {
@@ -62,14 +57,24 @@ VProfTool::Description()
 bool
 VProfTool::Start()
 {
-	g_VProfCurrentProfile.Start();
-	return IsActive();
+	// Some engines are very sensitive to exactly when in a frame vprof is
+	// enabled, the vprof commands use a special command registration method
+	// to defer their execution to the start of the next frame. Instead of
+	// starting/stopping vprof directly ourselves, we use the built-in commands
+	// to ensure that the timing is correct and the server does not crash.
+	//
+	// g_VProfCurrentProfile.Start();
+	engine->ServerCommand("vprof_on\n");
+	return true; // IsActive();
 }
 
 void
 VProfTool::Stop(void (*render)(const char *fmt, ...))
 {
-	g_VProfCurrentProfile.Stop();
+	// See note in VProfTool::Start
+	//
+	// g_VProfCurrentProfile.Stop();
+	engine->ServerCommand("vprof_off\n");
 	RenderHelp(render);
 }
 
diff --git a/core/vprof_tool.h b/core/vprof_tool.h
index 9a31b381..23b4ab1c 100644
--- a/core/vprof_tool.h
+++ b/core/vprof_tool.h
@@ -37,8 +37,6 @@ class VProfTool
 	  public SMGlobalClass
 {
 public:
-	VProfTool();
-
 	// IProfilingTool
 	const char *Name() override;
 	const char *Description() override;
@@ -53,9 +51,6 @@ public:
 
 	// SMGlobalClass
 	void OnSourceModAllInitialized() override;
-
-private:
-	bool active_;
 };
 
 #endif // _include_sourcemod_core_vprof_bridge_h_