Skip to content

Commit fd89785

Browse files
committed
fix a importSln bug where filename was assumed but a directory was given
1 parent 2997d03 commit fd89785

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

lib/importproject.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
299299
return ImportProject::Type::COMPILE_DB;
300300
}
301301
} else if (endsWith(filename, ".sln")) {
302-
if (importSln(fin, mPath, fileFilters)) {
302+
if (importSln(fin, filename, fileFilters)) {
303303
setRelativePaths(filename);
304304
return ImportProject::Type::VS_SLN;
305305
}
@@ -440,7 +440,7 @@ void ImportProject::setSolution(const std::string &filename, VariablesMap &varia
440440
variables["SolutionName"] = temp;
441441
}
442442

443-
bool ImportProject::importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters)
443+
bool ImportProject::importSln(std::istream &istr, const std::string &filename, const std::vector<std::string> &fileFilters)
444444
{
445445
std::string line;
446446

@@ -460,7 +460,7 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const
460460
}
461461

462462
VariablesMap solutionVariables;
463-
setSolution(path, solutionVariables);
463+
setSolution(filename, solutionVariables);
464464

465465
solutionVariables["VisualStudioVersion"] = "17.0";
466466

lib/importproject.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class CPPCHECKLIB WARN_UNUSED ImportProject {
154154
std::string languageStandard;
155155
};
156156

157-
bool importSln(std::istream &istr, const std::string &path, const std::vector<std::string> &fileFilters);
157+
bool importSln(std::istream &istr, const std::string &filename, const std::vector<std::string> &fileFilters);
158158
bool importSlnx(const std::string& filename, const std::vector<std::string>& fileFilters);
159159
bool importVcxproj(const std::string &filename, VariablesMap &variables, const std::vector<std::string> &fileFilters);
160160

0 commit comments

Comments
 (0)