From 873eff85f179593d486793be24b3cfaf73226e1f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 May 2017 18:22:09 +0300
Subject: Add subdir support in VirtFs::getDirs.

---
 src/fs/virtfs/fszip.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/fs/virtfs/fszip.cpp')

diff --git a/src/fs/virtfs/fszip.cpp b/src/fs/virtfs/fszip.cpp
index b2e123f49..cc720f626 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -408,10 +408,13 @@ namespace FsZip
     }
 
     void getDirs(FsEntry *restrict const entry,
-                 const std::string &dirName,
+                 std::string dirName,
                  StringVect &names)
     {
         ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
+        const std::string subDir = zipEntry->subDir;
+        if (subDir != dirSeparator)
+            dirName = pathJoin(subDir, dirName);
         if (dirName == dirSeparator)
         {
             FOR_EACH (std::vector<ZipLocalHeader*>::const_iterator,
-- 
cgit v1.2.3-70-g09d2