From a6572dd0422b23f067f9372cf99116b38bb6f715 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Mon, 15 Apr 2019 04:59:05 +0700
Subject: [PATCH] ref_soft: fix crash on map restart again

---
 r_main.c | 2 --
 r_surf.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/r_main.c b/r_main.c
index f1103a4d..0873684c 100644
--- a/r_main.c
+++ b/r_main.c
@@ -1840,8 +1840,6 @@ void GAME_EXPORT R_NewMap (void)
 	R_ClearDecals(); // clear all level decals
 	R_StudioResetPlayerModels();
 
-	D_FlushCaches();
-
 	r_cnumsurfs = sw_maxsurfs->value;
 
 	if (r_cnumsurfs <= MINSURFACES)
diff --git a/r_surf.c b/r_surf.c
index a16256dc..954e3b3b 100644
--- a/r_surf.c
+++ b/r_surf.c
@@ -1010,7 +1010,7 @@ void D_FlushCaches( void )
 	qboolean newmap = !world || !Q_strcmp( tr.mapname, WORLDMODEL->name );
 
 	// if newmap, surfaces already freed
-	if( !newmap && !tr.map_unload )
+	if( !tr.map_unload )
 	{
 		for(c = sc_base ; c ; c = c->next )
 		{