From b8343cd11c834fb2613b104418ed08e9fdb1665a Mon Sep 17 00:00:00 2001 From: sapier Date: Wed, 2 Jul 2014 23:33:18 +0200 Subject: Fix memory leaks in GenericCAO, ShaderSource and Player classes --- src/shader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/shader.cpp') diff --git a/src/shader.cpp b/src/shader.cpp index f855a7fe3..ef15f29ba 100644 --- a/src/shader.cpp +++ b/src/shader.cpp @@ -383,13 +383,16 @@ ShaderSource::ShaderSource(IrrlichtDevice *device): ShaderSource::~ShaderSource() { - //m_shader_callback->drop(); - for (std::vector::iterator iter = m_global_setters.begin(); iter != m_global_setters.end(); iter++) { delete *iter; } m_global_setters.clear(); + + if (m_shader_callback) { + m_shader_callback->drop(); + m_shader_callback = NULL; + } } u32 ShaderSource::getShader(const std::string &name, -- cgit v1.2.3