Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp

1 files changed, 5 insertions, 7 deletions

diff --git a/src/tools/map_extractor/loadlib.cpp b/src/tools/map_extractor/loadlib.cpp
index 6a47f2d2a30..d549a0c96f4 100644
--- a/src/tools/map_extractor/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib.cpp
@@ -30,19 +30,17 @@ bool FileLoader::loadFile(HANDLE mpq, char* filename, bool log)
 
     data_size = SFileGetFileSize(file, NULL);
     data = new uint8[data_size];
-    if (data)
+    SFileReadFile(file, data, data_size, NULL/*bytesRead*/, NULL);
+    if (prepareLoadedData())
     {
-        SFileReadFile(file, data, data_size, NULL/*bytesRead*/, NULL);
-        if (prepareLoadedData())
-        {
-            SFileCloseFile(file);
-            return true;
-        }
+        SFileCloseFile(file);
+        return true;
     }
 
     printf("Error loading %s\n", filename);
     SFileCloseFile(file);
     free();
+
     return false;
 }