From 8e1be3a5d243864186e161b81c84921c337c4d96 Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Tue, 5 Nov 2013 14:53:57 +0100
Subject: [PATCH] Attempt to fix some VFS problems

---
 ExternalLibs/ttvfs/VFSDir.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ExternalLibs/ttvfs/VFSDir.cpp b/ExternalLibs/ttvfs/VFSDir.cpp
index 536ab72..6d0d6d8 100644
--- a/ExternalLibs/ttvfs/VFSDir.cpp
+++ b/ExternalLibs/ttvfs/VFSDir.cpp
@@ -97,6 +97,10 @@ bool VFSDir::merge(VFSDir *dir, bool overwrite, EntryFlags flag)
     if(dir == this)
         return true; // nothing to do then
 
+	// HACK: make sure the files are there before merging
+	this->load(false);
+	dir->load(false);
+
     bool result = false;
     VFS_GUARD_OPT(this);