From 1fdcaa691b68eb03fc1f85648a5c3045dae7bd89 Mon Sep 17 00:00:00 2001 From: Shlainn Date: Wed, 9 Nov 2011 12:49:48 +0100 Subject: [PATCH] * Fix crash in case of missing databases --- src/Client/GUI/DrawObject.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Client/GUI/DrawObject.cpp b/src/Client/GUI/DrawObject.cpp index 9ac1fae..8a45f20 100644 --- a/src/Client/GUI/DrawObject.cpp +++ b/src/Client/GUI/DrawObject.cpp @@ -57,6 +57,11 @@ void DrawObject::_Init(void) uint32 displayid = _obj->GetUInt32Value(UNIT_FIELD_DISPLAYID); SCPDatabase *cdi = _instance->dbmgr.GetDB("creaturedisplayinfo"); SCPDatabase *cmd = _instance->dbmgr.GetDB("creaturemodeldata"); + if(cdi == NULL || cmd == NULL) + { + logerror("DrawObject: Could not open SCP Database"); + return; + } uint32 modelid = cdi && displayid ? cdi->GetUint32(displayid,"model") : 0; logdebug("modelid = %u, displayid = %u",modelid,displayid); // modelfilename = std::string("data/model/") + (cmd ? cmd->GetString(modelid,"file") : "");