merge bitcoin#24266: Avoid buggy std::filesystem:::create_directories…

…() call
dashpay · Aug 13, 2024 · f4b896e · f4b896e
1 parent b02d5e3
commit f4b896e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/util/system.cpp b/src/util/system.cpp
@@ -463,14 +463,18 @@ const fs::path& ArgsManager::GetDataDir(bool net_specific) const
     } else {
         path = GetDefaultDataDir();
     }
-    if (net_specific)
-        path /= fs::PathFromString(BaseParams().DataDir());
 
-    if (fs::create_directories(path)) {
-        // This is the first run, create wallets subdirectory too
+    if (!fs::exists(path)) {
         fs::create_directories(path / "wallets");
     }
 
+    if (net_specific && !BaseParams().DataDir().empty()) {
+        path /= fs::PathFromString(BaseParams().DataDir());
+        if (!fs::exists(path)) {
+            fs::create_directories(path / "wallets");
+        }
+    }
+
     path = StripRedundantLastElementsOfPath(path);
     return path;
 }