diff --git a/VirtualFileSystem/VirtualFileSystem.cs b/VirtualFileSystem/VirtualFileSystem.cs index f54f9931..8a3532a4 100644 --- a/VirtualFileSystem/VirtualFileSystem.cs +++ b/VirtualFileSystem/VirtualFileSystem.cs @@ -274,7 +274,9 @@ namespace VFS public StagingGroup StageWith(IEnumerable files) { - return new StagingGroup(files); + var grp = new StagingGroup(files); + grp.Stage(); + return grp; } public VirtualFile this[string path] @@ -330,7 +332,7 @@ namespace VFS public VirtualFile FileForArchiveHashPath(string[] archiveHashPath) { var archive = HashIndex[archiveHashPath[0]].Where(a => a.IsArchive).OrderByDescending(a => a.LastModified).First(); - string fullPath = HashIndex[archiveHashPath[0]] + "|" + String.Join("|", archiveHashPath.Skip(1)); + string fullPath = archive.FullPath + "|" + String.Join("|", archiveHashPath.Skip(1)); return Lookup(fullPath); } } diff --git a/Wabbajack/Compiler.cs b/Wabbajack/Compiler.cs index 2851d74a..64ecc962 100644 --- a/Wabbajack/Compiler.cs +++ b/Wabbajack/Compiler.cs @@ -720,7 +720,7 @@ namespace Wabbajack { var indexed = IndexedFiles.Values .SelectMany(f => f) - .GroupBy(f => Path.GetFileName(f.Paths.Last())) + .GroupBy(f => Path.GetFileName(f.Paths.Last()).ToLower()) .ToDictionary(f => f.Key); return source =>