Fix import GUI project problem

danmar · danmar · commit 7a4e6daecde8 · 2020-07-17T11:26:03.000+02:00
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -1074,14 +1074,16 @@ bool ImportProject::importCppcheckGuiProject(std::istream &istr, Settings *setti
             guiProject.libraries = readXmlStringList(node, "", CppcheckXml::LibraryElementName, nullptr);
         else if (strcmp(node->Name(), CppcheckXml::SuppressionsElementName) == 0) {
             for (const tinyxml2::XMLElement *child = node->FirstChildElement(); child; child = child->NextSiblingElement()) {
-                if (strcmp(child->Name(), CppcheckXml::SuppressionsElementName) != 0)
+                if (strcmp(child->Name(), CppcheckXml::SuppressionElementName) != 0)
                     continue;
                 auto read = [](const char *s, const char *def) {
                     return s ? s : def;
                 };
                 Suppressions::Suppression s;
                 s.errorId = read(child->GetText(), "");
                 s.fileName = read(child->Attribute("fileName"), "");
+                if (!s.fileName.empty())
+                    s.fileName = joinRelativePath(path, s.fileName);
                 s.lineNumber = child->IntAttribute("lineNumber", Suppressions::Suppression::NO_LINE);
                 s.symbolName = read(child->Attribute("symbolName"), "");
                 std::istringstream(read(child->Attribute("cppcheck-id"), "0")) >> s.cppcheckId;
