summaryrefslogtreecommitdiff
path: root/src/common/Utilities/DataMap.h
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2018-03-01 14:20:46 +0000
committerYehonal <yehonal.azeroth@gmail.com>2018-03-02 21:03:40 +0000
commita36e94a49a5b3bbdf01c622600c87da8cf55a26b (patch)
tree0751fb5aecf5a1eb764fbe24161e3cba866b366a /src/common/Utilities/DataMap.h
parent93cf5edd57cd59d963da63b95159754b658fa479 (diff)
Fixed crashes with not initialized CustomData
Diffstat (limited to 'src/common/Utilities/DataMap.h')
-rw-r--r--src/common/Utilities/DataMap.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/Utilities/DataMap.h b/src/common/Utilities/DataMap.h
index 976b50e88e..0d6ce20fbe 100644
--- a/src/common/Utilities/DataMap.h
+++ b/src/common/Utilities/DataMap.h
@@ -28,6 +28,9 @@ public:
*/
template<class T> T* Get(std::string const & k) const {
static_assert(std::is_base_of<Base, T>::value, "T must derive from Base");
+ if (Container.empty())
+ return nullptr;
+
auto it = Container.find(k);
if (it != Container.end())
return dynamic_cast<T*>(it->second.get());