Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/tools/vmap4_extractor/vmapexport.cpp

1 files changed, 7 insertions, 1 deletions

diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp
index 3bfed7d322d..207b652a4d6 100644
--- a/src/server/collision/Maps/TileAssembler.cpp
+++ b/src/server/collision/Maps/TileAssembler.cpp
@@ -336,9 +336,15 @@ namespace VMAP
     void TileAssembler::exportGameobjectModels()
     {
         FILE* model_list = fopen((iSrcDir + "/" + "temp_gameobject_models").c_str(), "rb");
+        if (!model_list)
+            return;
+
         FILE* model_list_copy = fopen((iDestDir + "/" + GAMEOBJECT_MODELS).c_str(), "wb");
-        if (!model_list || !model_list_copy)
+        if (!model_list_copy)
+        {
+            fclose(model_list);
             return;
+        }
 
         uint32 name_length, displayId;
         char buff[500];