From f0150069c8161450d0e7caacef224345cece047d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Tue, 8 Feb 2022 08:52:27 +0100 Subject: [PATCH] ImportProject: Fix loading of sln without BOM --- lib/importproject.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/importproject.cpp b/lib/importproject.cpp index 1d8642493..085bab60f 100644 --- a/lib/importproject.cpp +++ b/lib/importproject.cpp @@ -466,15 +466,17 @@ bool ImportProject::importSln(std::istream &istr, const std::string &path, const { std::string line; - // skip magic word if (!std::getline(istr,line)) { printError("Visual Studio solution file is empty"); return false; } - if (!std::getline(istr, line) || line.find("Microsoft Visual Studio Solution File") != 0) { - printError("Visual Studio solution file header not found"); - return false; + if (line.find("Microsoft Visual Studio Solution File") != 0) { + // Skip BOM + if (!std::getline(istr, line) || line.find("Microsoft Visual Studio Solution File") != 0) { + printError("Visual Studio solution file header not found"); + return false; + } } std::map variables;