Merge pull request #14719 from cscd98/m3u-fix

m3u: normalize line endings except win32
2026-07-14 19:14:59 +02:00
parent 1b67ed71f4 4b55c26cdb
commit fee15d96ad
1 changed files with 5 additions and 0 deletions
@@ -76,6 +76,11 @@ static std::vector<std::string> ReadM3UFile(const std::string& m3u_path,
    // This is the UTF-8 representation of U+FEFF.
    constexpr std::string_view utf8_bom = "\xEF\xBB\xBF";

+#ifndef _WIN32
+    if (line.ends_with('\r'))
+      line.pop_back();
+#endif
+
    if (line.starts_with(utf8_bom))
    {
      WARN_LOG_FMT(BOOT, "UTF-8 BOM in file: {}", m3u_path);