Merge branch 'master' of https://github.com/dolphin-emu/dolphin into dolphin-emu-maste2r

This commit is contained in:
Nayla Hanegan 2024-12-24 20:47:03 -05:00
commit 75a9451d0b
218 changed files with 53095 additions and 44354 deletions

View file

@ -310,11 +310,9 @@ void Settings::RemovePath(const QString& qpath)
std::string path = qpath.toStdString();
std::vector<std::string> paths = Config::GetIsoPaths();
auto new_end = std::remove(paths.begin(), paths.end(), path);
if (new_end == paths.end())
if (std::erase(paths, path) == 0)
return;
paths.erase(new_end, paths.end());
Config::SetIsoPaths(paths);
emit PathRemoved(qpath);
}