From b9889476fc6f0ea84b0d4fe596505953b15d1bb4 Mon Sep 17 00:00:00 2001 From: xwidghet Date: Thu, 16 Mar 2017 03:40:56 -0700 Subject: [PATCH] Ensure the texture garbage collector never runs during gameplay. --- src/RageTextureManager.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/RageTextureManager.cpp b/src/RageTextureManager.cpp index f3c4b31e1c..965ac72b8a 100644 --- a/src/RageTextureManager.cpp +++ b/src/RageTextureManager.cpp @@ -27,6 +27,8 @@ #include "RageDisplay.h" #include "Foreach.h" #include "ActorUtil.h" +#include "Screen.h" +#include "ScreenManager.h" #include @@ -61,10 +63,13 @@ void RageTextureManager::Update( float fDeltaTime ) static RageTimer garbageCollector; if (garbageCollector.PeekDeltaTime() >= 30.0f) { - DoDelayedDelete(); - garbageCollector.Touch(); - } - + if (SCREENMAN && SCREENMAN->GetTopScreen() && + SCREENMAN->GetTopScreen()->GetScreenType() != gameplay) + { + DoDelayedDelete(); + garbageCollector.Touch(); + } + } FOREACHM(RageTextureID, RageTexture*, m_textures_to_update, i) {