From 130bd7bbb6d2ac42d908df24f3e53cdca1c3ad39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 30 Mar 2025 10:49:50 +0200 Subject: [PATCH] Savedata title fix, see #20180 --- UI/SavedataScreen.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/UI/SavedataScreen.cpp b/UI/SavedataScreen.cpp index 498dc10c09..4bd1dcbafb 100644 --- a/UI/SavedataScreen.cpp +++ b/UI/SavedataScreen.cpp @@ -273,12 +273,6 @@ void SavedataButton::UpdateDateSeconds() { hasDateSeconds_ = true; } -static std::string CleanSaveString(std::string_view str) { - std::string s = ReplaceAll(str, "\n", " "); - s = ReplaceAll(s, "\r", " "); - return s; -} - bool SavedataButton::UpdateText() { std::shared_ptr ginfo = g_gameInfoCache->GetInfo(nullptr, savePath_, GameInfoFlags::PARAM_SFO); if (ginfo->Ready(GameInfoFlags::PARAM_SFO)) { @@ -291,12 +285,12 @@ bool SavedataButton::UpdateText() { void SavedataButton::UpdateText(const std::shared_ptr &ginfo) { const std::string currentTitle = ginfo->GetTitle(); if (!currentTitle.empty()) { - title_ = CleanSaveString(currentTitle); + title_ = SanitizeString(currentTitle, StringRestriction::NoLineBreaksOrSpecials); } if (subtitle_.empty() && ginfo->gameSizeOnDisk > 0) { std::string date = ginfo->GetMTime(); std::string savedata_title = ginfo->GetParamSFO().GetValueString("SAVEDATA_TITLE"); - subtitle_ = CleanSaveString(savedata_title) + " (" + NiceSizeFormat(ginfo->gameSizeOnDisk) + ", " + date + ")"; + subtitle_ = SanitizeString(savedata_title, StringRestriction::NoLineBreaksOrSpecials) + " (" + NiceSizeFormat(ginfo->gameSizeOnDisk) + ", " + date + ")"; } }