From d005626aa0a7f09f84b7790e761c859344b35cca Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 5 Jun 2022 18:01:23 +0200
Subject: [PATCH] Fix VPK root files bug

Files names of files located in the root of a VPK weren't formatted properly
---
 r5dev/public/utility.cpp     | 2 ++
 r5dev/vpklib/packedstore.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/r5dev/public/utility.cpp b/r5dev/public/utility.cpp
index cd917497..41875119 100644
--- a/r5dev/public/utility.cpp
+++ b/r5dev/public/utility.cpp
@@ -314,10 +314,12 @@ string CreateDirectories(string svInput, bool bWindows)
     if (bWindows)
     {
         StringReplace(svInput, "\\ \\", "\\");
+        StringReplace(svInput, " \\", "");
     }
     else
     {
         StringReplace(svInput, "/ /", "/");
+        StringReplace(svInput, " /", "");
     }
 
     fs::path fspPathOut(svInput);
diff --git a/r5dev/vpklib/packedstore.cpp b/r5dev/vpklib/packedstore.cpp
index 4b840e90..1d7c950e 100644
--- a/r5dev/vpklib/packedstore.cpp
+++ b/r5dev/vpklib/packedstore.cpp
@@ -523,7 +523,7 @@ void CPackedStore::UnpackAll(const VPKDir_t& vpkDir, const string& svPathOut)
 			}
 			else // Chunk belongs to this block.
 			{
-				string svFilePath = CreateDirectories(svPathOut + vpkDir.m_vvEntryBlocks[j].m_svBlockPath, true);
+				string svFilePath = CreateDirectories(svPathOut + vpkDir.m_vvEntryBlocks[j].m_svBlockPath);
 				CIOStream oStream(svFilePath, CIOStream::Mode_t::WRITE);
 
 				if (!oStream.IsWritable())