From cb9a17563e89274c5b24fadbf9597c50399d49a5 Mon Sep 17 00:00:00 2001 From: Benau Date: Sun, 30 Sep 2018 13:00:24 +0800 Subject: [PATCH] Don't call SP::SPTextureManager::get() if not GLSL to avoid leaking --- src/graphics/material_manager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/graphics/material_manager.cpp b/src/graphics/material_manager.cpp index 2a1b8c04a..421d86f61 100644 --- a/src/graphics/material_manager.cpp +++ b/src/graphics/material_manager.cpp @@ -23,6 +23,7 @@ #include #include "config/user_config.hpp" +#include "graphics/central_settings.hpp" #include "graphics/material.hpp" #include "graphics/particle_kind_manager.hpp" #include "graphics/sp/sp_texture_manager.hpp" @@ -57,9 +58,10 @@ MaterialManager::MaterialManager() MaterialManager::~MaterialManager() { #ifndef SERVER_ONLY - SP::SPTextureManager::get()->stopThreads(); + if (CVS->isGLSL()) + SP::SPTextureManager::get()->stopThreads(); #endif - + for(unsigned int i=0; i