Merge pull request #11372 from JosJuice/m3u-backslash

Boot: Fix handling of M3U file paths containing backslashes
dolphin-emu · Dec 29, 2022 · c20bb01 · c20bb01
2 parents 4bc94e4 + 71f1b1d
commit c20bb01
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
@@ -205,6 +205,9 @@ std::unique_ptr<BootParameters> BootParameters::GenerateFromFile(std::vector<std
 {
   ASSERT(!paths.empty());
 
+  for (std::string& path : paths)
+    UnifyPathSeparators(path);
+
   const bool is_drive = Common::IsCDROMDevice(paths.front());
   // Check if the file exist, we may have gotten it from a --elf command line
   // that gave an incorrect file name
@@ -225,6 +228,9 @@ std::unique_ptr<BootParameters> BootParameters::GenerateFromFile(std::vector<std
     if (paths.empty())
       return {};
 
+    for (std::string& path : paths)
+      UnifyPathSeparators(path);
+
     SplitPath(paths.front(), nullptr, nullptr, &extension);
     Common::ToLower(&extension);
   }