From 436abf9f8cc33dfff1fe21b8ec5e61854facbd0c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 28 Sep 2012 23:20:00 +0300 Subject: fix null pointer from previous commits. --- src/resources/resourcemanager.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp index 9c9bb3b32..9f2947dfc 100644 --- a/src/resources/resourcemanager.cpp +++ b/src/resources/resourcemanager.cpp @@ -214,16 +214,25 @@ bool ResourceManager::cleanOrphans(const bool always) { #ifdef USE_OPENGL const Image *const image = dynamic_cast(res); - const std::string src = image->getSource(); - if (image && image->getGLImage()) + if (image) { - logger->log("ResourceManager::release(%s, %u) %s", - res->mIdPath.c_str(), image->getGLImage(), src.c_str()); + const std::string src = image->getSource(); + if (image && image->getGLImage()) + { + logger->log("ResourceManager::release(%s, %u) %s", + res->mIdPath.c_str(), image->getGLImage(), + src.c_str()); + } + else + { + logger->log("ResourceManager::release(%s) %s", + res->mIdPath.c_str(), src.c_str()); + } } else { - logger->log("ResourceManager::release(%s) %s", - res->mIdPath.c_str(), src.c_str()); + logger->log("ResourceManager::release(%s)", + res->mIdPath.c_str()); } #else logger->log("ResourceManager::release(%s)", res->mIdPath.c_str()); -- cgit v1.2.3-60-g2f50