* (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_ui.c

@@ -1173,7 +1173,7 @@ void CL_InitUI( void ) {
 	}
 
 	// reset any CVAR_CHEAT cvars registered by ui
-	if ( !cl_connectedToCheatServer ) 
+	if ( !clc.demoplaying && !cl_connectedToCheatServer ) 
 		Cvar_SetCheatState();
 }