ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash when textures are not found

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8561 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-05-13 01:33:22 +00:00
parent 3d743e8e2d
commit 8b92b84076
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/graphics/material.cpp
View File

@ -255,6 +255,8 @@ void Material::install(bool is_full_path)
m_texture = irr_driver->getTexture(full_path,
isPreMul(), isPreDiv());
if (m_texture == NULL) return;
// now set the name to the basename, so that all tests work as expected
m_texname = StringUtils::getBasename(m_texname);
@ -277,10 +279,13 @@ void Material::install(bool is_full_path)
//-----------------------------------------------------------------------------
Material::~Material()
{
assert(m_texture);
m_texture->drop();
if(m_texture->getReferenceCount()==1)
irr_driver->removeTexture(m_texture);
if (m_texture != NULL)
{
m_texture->drop();
if(m_texture->getReferenceCount()==1)
irr_driver->removeTexture(m_texture);
}
// If a special sfx is installed (that isn't part of stk itself), the
// entry needs to be removed from the sfx_manager's mapping, since other
// tracks might use the same name.