OSDN Git Service

Fix issue #1793: Opening a project fails when a path has environmental variables...
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 6 Apr 2023 13:58:00 +0000 (22:58 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Thu, 6 Apr 2023 13:58:00 +0000 (22:58 +0900)
Src/Merge.cpp

index 7e37209..51a469e 100644 (file)
@@ -1346,6 +1346,7 @@ bool CMergeApp::LoadAndOpenProjectFile(const String& sProject, const String& sRe
                projItem.GetPaths(tFiles, bDummy);
                for (int i = 0; i < tFiles.GetSize(); ++i)
                {
+                       tFiles[i] = env::ExpandEnvironmentVariables(tFiles[i]);
                        if (!paths::IsPathAbsolute(tFiles[i]) && !paths::IsURL(tFiles[i]))
                        {
                                String sProjectDir = paths::GetParentPath(sProject);