From fffbd86a1014ad169ed2d68ea58cdddf346faa14 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Jul 2015 00:47:44 +0300
Subject: Add missing checks and non null attributes.

---
 src/resources/db/emotedb.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/resources/db/emotedb.cpp')

diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index accea5ae9..eb5eef418 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -108,6 +108,8 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
             currentInfo = mEmoteInfos[id];
         else
             currentInfo = new EmoteInfo;
+        if (!currentInfo)
+            continue;
         currentInfo->time = XML::getProperty(emoteNode, "time", 500);
         currentInfo->effectId = XML::getProperty(emoteNode, "effect", -1);
 
-- 
cgit v1.2.3-70-g09d2