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

@@ -508,7 +508,8 @@ void CL_PlayDemo_f( void ) {
 	}
 
 	// make sure a local server is killed
-	Cvar_Set( "sv_killserver", "1" );
+	// 2 means don't force disconnect of local client
+	Cvar_Set( "sv_killserver", "2" );
 
 	CL_Disconnect( qtrue );