* (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/server/sv_init.c

@@ -747,6 +747,7 @@ void SV_Shutdown( char *finalmsg ) {
 	Com_Printf( "---------------------------\n" );
 
 	// disconnect any local clients
-	CL_Disconnect( qfalse );
+	if( sv_killserver->integer != 2 )
+		CL_Disconnect( qfalse );
 }