diff -r f57d6a76bb31 -r 608c56ebced9 extensions/tf2/extension.cpp
--- a/extensions/tf2/extension.cpp	Wed Nov 24 20:46:17 2010 -0500
+++ b/extensions/tf2/extension.cpp	Sun Nov 28 22:41:48 2010 -0500
@@ -309,21 +309,19 @@
 {
 	if (!m_CritDetoursEnabled && g_critForward->GetFunctionCount())
 	{
-		InitialiseCritDetours();
-		m_CritDetoursEnabled = true;
+		m_CritDetoursEnabled = InitialiseCritDetours();
 	}
+
 	if (!m_GetHolidayDetourEnabled && g_getHolidayForward->GetFunctionCount())
 	{
-		InitialiseGetHolidayDetour();
-		m_GetHolidayDetourEnabled = true;
+		m_GetHolidayDetourEnabled = InitialiseGetHolidayDetour();
 	}
-	if (!m_RulesDetoursEnabled)
+
+	if (!m_RulesDetoursEnabled
+		&& ( g_waitingPlayersStartForward->GetFunctionCount() || g_waitingPlayersEndForward->GetFunctionCount() )
+		)
 	{
-		if(g_waitingPlayersStartForward->GetFunctionCount() || g_waitingPlayersEndForward->GetFunctionCount())
-		{
-			InitialiseRulesDetours();
-			m_RulesDetoursEnabled = true;
-		}
+		m_RulesDetoursEnabled = InitialiseRulesDetours();
 	}
 }
 
@@ -341,7 +339,7 @@
 	}
 	if (m_RulesDetoursEnabled)
 	{
-		if(!g_waitingPlayersStartForward->GetFunctionCount() || !g_waitingPlayersEndForward->GetFunctionCount())
+		if (!g_waitingPlayersStartForward->GetFunctionCount() && !g_waitingPlayersEndForward->GetFunctionCount())
 		{
 			RemoveRulesDetours();
 			m_RulesDetoursEnabled = false;