PowerOlive
/
spheretest-1
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix double free, null texture drop

master
kwolekr 2013-04-12 17:20:05 -04:00
parent 7cd5eb4c77
commit ce901f4c4c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/emerge.cpp
View File

@ -97,9 +97,6 @@ EmergeManager::~EmergeManager() {
delete mapgen[i]; delete mapgen[i];
} }
emergethread.clear(); emergethread.clear();
for (unsigned int i = 0; i < mapgen.size(); i++)
delete mapgen[i];
mapgen.clear(); mapgen.clear();
for (unsigned int i = 0; i < ores.size(); i++) for (unsigned int i = 0; i < ores.size(); i++)

3
src/tile.cpp
View File

@ -480,7 +480,8 @@ TextureSource::~TextureSource()
driver->removeTexture(t); driver->removeTexture(t);
//cleanup source image //cleanup source image
iter->atlas_img->drop(); if (iter->atlas_img)
iter->atlas_img->drop();
} }
m_atlaspointer_cache.clear(); m_atlaspointer_cache.clear();