ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2655 from mimimi085181/texturecache-iterator-fix 

Quick fix for an invalid iterator
This commit is contained in:
Jules Blok 2015-06-24 19:27:08 +02:00
parent 6d273f6119 829fc3dc2d
commit 6274cdb478
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/TextureCacheBase.cpp
View File

@ -933,16 +933,16 @@ TextureCache::TCacheEntryBase* TextureCache::AllocateTexture(const TCacheEntryCo
INCSTAT(stats.numTexturesCreated); INCSTAT(stats.numTexturesCreated);
} }
entry->textures_by_hash_iter = textures_by_address.end(); entry->textures_by_hash_iter = textures_by_hash.end();
return entry; return entry;
} }
TextureCache::TexCache::iterator TextureCache::RemoveTextureFromCache(TexCache::iterator iter) TextureCache::TexCache::iterator TextureCache::RemoveTextureFromCache(TexCache::iterator iter)
{ {
if (iter->second->textures_by_hash_iter != textures_by_address.end()) if (iter->second->textures_by_hash_iter != textures_by_hash.end())
{ {
textures_by_hash.erase(iter->second->textures_by_hash_iter); textures_by_hash.erase(iter->second->textures_by_hash_iter);
iter->second->textures_by_hash_iter = textures_by_address.end(); iter->second->textures_by_hash_iter = textures_by_hash.end();
} }
FreeTexture(iter->second); FreeTexture(iter->second);