From 284fab7254bf6bba5b3c2bc8ae2321e58e026172 Mon Sep 17 00:00:00 2001
From: Kyle Sanderson <kyle.leet@gmail.com>
Date: Sat, 21 Feb 2015 17:10:26 -0800
Subject: [PATCH] Root Menu Handles during Display.

---
 core/MenuStyle_Radio.cpp | 1 +
 core/MenuStyle_Radio.h   | 2 ++
 core/MenuStyle_Valve.cpp | 1 +
 core/MenuStyle_Valve.h   | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/core/MenuStyle_Radio.cpp b/core/MenuStyle_Radio.cpp
index 4d33e9ba..e9b98546 100644
--- a/core/MenuStyle_Radio.cpp
+++ b/core/MenuStyle_Radio.cpp
@@ -593,6 +593,7 @@ bool CRadioMenu::DisplayAtItem(int client,
 		return false;
 	}
 
+	AutoHandleRooter ahr(this->GetHandle());
 	return g_RadioMenuStyle.DoClientMenu(client,
 		this,
 		start_item,
diff --git a/core/MenuStyle_Radio.h b/core/MenuStyle_Radio.h
index b7a32741..90f6a59f 100644
--- a/core/MenuStyle_Radio.h
+++ b/core/MenuStyle_Radio.h
@@ -41,6 +41,8 @@
 #include "sm_fastlink.h"
 #include <sh_stack.h>
 #include <compat_wrappers.h>
+#include "logic/common_logic.h"
+#include "AutoHandleRooter.h"
 
 using namespace SourceMod;
 
diff --git a/core/MenuStyle_Valve.cpp b/core/MenuStyle_Valve.cpp
index 97e551d9..24b261a1 100644
--- a/core/MenuStyle_Valve.cpp
+++ b/core/MenuStyle_Valve.cpp
@@ -408,6 +408,7 @@ bool CValveMenu::DisplayAtItem(int client,
 		return false;
 	}
 
+	AutoHandleRooter ahr(this->GetHandle());
 	return g_ValveMenuStyle.DoClientMenu(client, this, start_item, alt_handler ? alt_handler : m_pHandler, time);
 }
 
diff --git a/core/MenuStyle_Valve.h b/core/MenuStyle_Valve.h
index 60b86919..03fa1226 100644
--- a/core/MenuStyle_Valve.h
+++ b/core/MenuStyle_Valve.h
@@ -39,6 +39,8 @@
 #include "KeyValues.h"
 #include "sm_fastlink.h"
 #include <compat_wrappers.h>
+#include "logic/common_logic.h"
+#include "AutoHandleRooter.h"
 
 using namespace SourceMod;