more loading resources

11fea31b · Maarten L. Hekkelman · f629275e · 11fea31b
Commit 11fea31b authored May 18, 2022 by Maarten L. Hekkelman
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

src/CifUtils.cpp
+5 -1

No files found.
--- a/src/CifUtils.cpp
+++ b/src/CifUtils.cpp
@@ -1236,7 +1236,11 @@ std::unique_ptr<std::istream> loadResource(std::filesystem::path name)
 	}
 	if (not result and (not fs::exists(p, ec) or ec) and not gDataDir.empty())
-		p = gDataDir / name;
+	{
+		auto p2 = gDataDir / p;
+		if (fs::exists(p2, ec) and not ec)
+			swap(p, p2);
+	}
 #if defined(CACHE_DIR)
 	if (not result and (not fs::exists(p, ec) or ec))