1.1 --- a/core/PlayerManager.cpp	Fri Feb 17 12:04:20 2012 +0000
     1.2 +++ b/core/PlayerManager.cpp	Sat Feb 25 15:09:56 2012 -0500
     1.3 @@ -44,7 +44,6 @@
     1.4  #include "HalfLife2.h"
     1.5  #include <inetchannel.h>
     1.6  #include <iclient.h>
     1.7 -#include <tier0/icommandline.h>
     1.8  #include <IGameConfigs.h>
     1.9  #include "ExtensionSys.h"
    1.10  #include <sourcemod_version.h>
    1.11 @@ -244,7 +243,8 @@
    1.12  	// clientMax will not necessarily be correct here (such as on late SourceTV enable)
    1.13  	m_maxClients = gpGlobals->maxClients;
    1.14  
    1.15 -	m_bIsSourceTVActive = (tv_enable && tv_enable->GetBool() && CommandLine()->FindParm("-nohltv") == 0);
    1.16 +	ICommandLine *commandLine = g_HL2.GetValveCommandLine();
    1.17 +	m_bIsSourceTVActive = (tv_enable && tv_enable->GetBool() && (!commandLine || commandLine->FindParm("-nohltv") == 0));
    1.18  	m_bIsReplayActive = false;
    1.19  #if SOURCE_ENGINE == SE_ORANGEBOXVALVE
    1.20  	m_bIsReplayActive = (replay_enable && replay_enable->GetBool());