1.1 --- a/extensions/tf2/extension.cpp	Wed Nov 24 20:46:17 2010 -0500
     1.2 +++ b/extensions/tf2/extension.cpp	Sun Nov 28 22:41:48 2010 -0500
     1.3 @@ -309,21 +309,19 @@
     1.4  {
     1.5  	if (!m_CritDetoursEnabled && g_critForward->GetFunctionCount())
     1.6  	{
     1.7 -		InitialiseCritDetours();
     1.8 -		m_CritDetoursEnabled = true;
     1.9 +		m_CritDetoursEnabled = InitialiseCritDetours();
    1.10  	}
    1.11 +
    1.12  	if (!m_GetHolidayDetourEnabled && g_getHolidayForward->GetFunctionCount())
    1.13  	{
    1.14 -		InitialiseGetHolidayDetour();
    1.15 -		m_GetHolidayDetourEnabled = true;
    1.16 +		m_GetHolidayDetourEnabled = InitialiseGetHolidayDetour();
    1.17  	}
    1.18 -	if (!m_RulesDetoursEnabled)
    1.19 +
    1.20 +	if (!m_RulesDetoursEnabled
    1.21 +		&& ( g_waitingPlayersStartForward->GetFunctionCount() || g_waitingPlayersEndForward->GetFunctionCount() )
    1.22 +		)
    1.23  	{
    1.24 -		if(g_waitingPlayersStartForward->GetFunctionCount() || g_waitingPlayersEndForward->GetFunctionCount())
    1.25 -		{
    1.26 -			InitialiseRulesDetours();
    1.27 -			m_RulesDetoursEnabled = true;
    1.28 -		}
    1.29 +		m_RulesDetoursEnabled = InitialiseRulesDetours();
    1.30  	}
    1.31  }
    1.32  
    1.33 @@ -341,7 +339,7 @@
    1.34  	}
    1.35  	if (m_RulesDetoursEnabled)
    1.36  	{
    1.37 -		if(!g_waitingPlayersStartForward->GetFunctionCount() || !g_waitingPlayersEndForward->GetFunctionCount())
    1.38 +		if (!g_waitingPlayersStartForward->GetFunctionCount() && !g_waitingPlayersEndForward->GetFunctionCount())
    1.39  		{
    1.40  			RemoveRulesDetours();
    1.41  			m_RulesDetoursEnabled = false;