From 0a849f982988cbd7c7afdedccb210bada702238b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 May 2017 16:28:54 +0300
Subject: Add subdir support in VirtFs::isDirectory.

---
 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 5118ec93c..e7fab595f 100644
--- a/src/fs/virtfs/fszip.cpp
+++ b/src/fs/virtfs/fszip.cpp
@@ -500,10 +500,13 @@ namespace FsZip
     }
 
     bool isDirectory(FsEntry *restrict const entry,
-                     const std::string &dirName,
+                     std::string dirName,
                      bool &isDirFlag)
     {
         ZipEntry *const zipEntry = static_cast<ZipEntry*>(entry);
+        std::string subDir = zipEntry->subDir;
+        if (subDir != dirSeparator)
+            dirName = pathJoin(subDir, dirName);
         FOR_EACH (std::vector<std::string>::const_iterator,
                   it2,
                   zipEntry->mDirs)
-- 
cgit v1.2.3-70-g09d2