* (bug 3018) Should not reset CVAR_CHEAT cvars when loading cgame/ui if they

are being loaded to play a demo.  This restores the normal
             "timedemo" cvar behaviour.
* (bug 3054) The "demo" command works properly now when connected to
             the local server

code/client/cl_cgame.c

@@ -747,7 +747,7 @@ void CL_InitCGame( void ) {
 	VM_Call( cgvm, CG_INIT, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum );
 
 	// reset any CVAR_CHEAT cvars registered by cgame
-	if ( !cl_connectedToCheatServer )
+	if ( !clc.demoplaying && !cl_connectedToCheatServer )
 		Cvar_SetCheatState();
 
 	// we will send a usercmd this frame, which