diff options
| -rw-r--r-- | zenserver/cache/namespacecachestore.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/zenserver/cache/namespacecachestore.cpp b/zenserver/cache/namespacecachestore.cpp index 82ac40c62..1cf76b0ae 100644 --- a/zenserver/cache/namespacecachestore.cpp +++ b/zenserver/cache/namespacecachestore.cpp @@ -29,16 +29,17 @@ NamespaceCacheStore::NamespaceCacheStore(std::filesystem::path BasePath, CasGc& } LegacyBuckets.push_back(DirName); } - if (Namespaces.empty() && !LegacyBuckets.empty()) + + if (std::find(Namespaces.begin(), Namespaces.end(), "") == Namespaces.end()) { - // If we find no namespaces, but any unknown folders we assume we have a legacy folder - // and move any existing folders into a default namespace - std::filesystem::path DefaultfNamespaceFolder = m_BasePath / NamespaceDirPrefix; - CreateDirectories(DefaultfNamespaceFolder); + std::filesystem::path DefaultNamespaceFolder = m_BasePath / NamespaceDirPrefix; + CreateDirectories(DefaultNamespaceFolder); + + // Move any non-namespace folders into the default namespace folder for (const std::string& DirName : LegacyBuckets) { std::filesystem::path LegacyFolder = m_BasePath / DirName; - std::filesystem::path NewPath = DefaultfNamespaceFolder / DirName; + std::filesystem::path NewPath = DefaultNamespaceFolder / DirName; std::filesystem::rename(LegacyFolder, NewPath); } Namespaces.push_back(""); |