Merge branch 'master' into jc3-spam-killa

2021-05-10 22:21:13 +02:00
parent b30cbcf117 cdc0bd00ce
commit cb7d3ac598
12 changed files with 53 additions and 13 deletions
--- a/code/AssetLib/AMF/AMFImporter.cpp
+++ b/code/AssetLib/AMF/AMFImporter.cpp
@@ -268,7 +268,7 @@ void AMFImporter::ParseFile(const std::string &pFile, IOSystem *pIOHandler) {
    mXmlParser = new XmlParser();
    if (!mXmlParser->parse(file.get())) {
        delete mXmlParser;
-        throw DeadlyImportError("Failed to create XML reader for file ", pFile, ".");
+        throw DeadlyImportError("Failed to create XML reader for file" + pFile + ".");
    }

    // Start reading, search for root tag <amf>