From 88fe079f95e16cd8e0e1f3184d968690ce4c6b91 Mon Sep 17 00:00:00 2001 From: AnyOldName3 Date: Fri, 17 Jan 2025 00:53:19 +0000 Subject: [PATCH] Don't mangle settings with the comment character in their value '#' is a valid character in setting values - it's only a comment if it's the first non-" \t\r\n" character on a line. Making the comment ignoring match the parser we use elsewhere should avoid mangling data. --- apps/mwiniimporter/importer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/mwiniimporter/importer.cpp b/apps/mwiniimporter/importer.cpp index 8c7c238b4a..cc38eed211 100644 --- a/apps/mwiniimporter/importer.cpp +++ b/apps/mwiniimporter/importer.cpp @@ -352,12 +352,10 @@ MwIniImporter::multistrmap MwIniImporter::loadCfgFile(const std::filesystem::pat std::string line; while (std::getline(file, line)) { - - // we cant say comment by only looking at first char anymore - int comment_pos = static_cast(line.find('#')); - if (comment_pos > 0) + // ignore comments - keep in sync with configfileparser.cpp + if (line.find('#') == line.find_first_not_of(" \t\r\n")) { - line = line.substr(0, comment_pos); + continue; } if (line.empty())