Skip to content
Permalink
Browse files

Merge.cpp: Allow path starting '\' without drive name in the project …

…file
  • Loading branch information
sdottaka committed Jan 5, 2020
1 parent 943d37b commit 765471ba6f6c18c064dc418610ca85867869fa8f
Showing with 10 additions and 1 deletion.
  1. +10 −1 Src/Merge.cpp
@@ -1121,7 +1121,16 @@ bool CMergeApp::LoadAndOpenProjectFile(const String& sProject, const String& sRe
for (int i = 0; i < tFiles.GetSize(); ++i)
{
if (!paths::IsPathAbsolute(tFiles[i]))
tFiles[i] = paths::ConcatPath(paths::GetParentPath(sProject), tFiles[i]);
{
String sProjectDir = paths::GetParentPath(sProject);
if (tFiles[i].substr(0, 1) == _T("\\"))
{
if (sProjectDir.length() > 1 && sProjectDir[1] == ':')
tFiles[i] = paths::ConcatPath(sProjectDir.substr(0, 2), tFiles[i]);
}
else
tFiles[i] = paths::ConcatPath(sProjectDir, tFiles[i]);
}
}
bool bLeftReadOnly = projItem.GetLeftReadOnly();
bool bMiddleReadOnly = projItem.GetMiddleReadOnly();

0 comments on commit 765471b

Please sign in to comment.
You can’t perform that action at this time.