summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
authordegasus <wickmarkus@web.de>2013-11-07 15:54:16 +0100
committerdegasus <wickmarkus@web.de>2013-11-07 15:55:34 +0100
commitea2d8bf328e72da63edc1cfaaebfb6495ea1ccce (patch)
tree6f49f5d1e2100e3e5e123c29a23bff206987c34f /Source/Core/VideoCommon
parentc33036aa0128836163f8856c2277cfda7035632b (diff)
VideoCommon: fix custom textures
This fix a regression by revision 6cece6b48667 delete pointer must not do anything if pointer==NULL.
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/Src/TextureCacheBase.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
index 41af7ac946..c29a59e2b4 100644
--- a/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
+++ b/Source/Core/VideoCommon/Src/TextureCacheBase.cpp
@@ -470,8 +470,11 @@ TextureCache::TCacheEntryBase* TextureCache::Load(unsigned int const stage,
expandedHeight = height;
// If we thought we could reuse the texture before, make sure to pool it now!
- PoolTexture(entry);
- entry = NULL;
+ if(entry)
+ {
+ PoolTexture(entry);
+ entry = NULL;
+ }
}
using_custom_texture = true;
}