From 574477866fe3e82a87214848d3d4b505535f2d3b Mon Sep 17 00:00:00 2001 From: Filoppi Date: Tue, 11 May 2021 16:30:29 +0300 Subject: InputCommon: fix serialization of control expression with line breaks The control expression editor allows line breaks, but the serialization was losing anything after the first line break (/r /n). Instead of opting to encode them and decode them on serialization (which I tried but was not safe, as it would lose /n written in the string by users), I opted to replace them with a space. --- Source/Core/Common/StringUtil.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/Core/Common/StringUtil.cpp') diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp index ffda64c79f..9c57bf944a 100644 --- a/Source/Core/Common/StringUtil.cpp +++ b/Source/Core/Common/StringUtil.cpp @@ -219,7 +219,7 @@ std::string ArrayToString(const u8* data, u32 size, int line_len, bool spaces) return oss.str(); } -// Turns " hello " into "hello". Also handles tabs. +// Turns "\n\r\t hello " into "hello" (trims at the start and end but not inside). std::string_view StripSpaces(std::string_view str) { const size_t s = str.find_first_not_of(" \t\r\n"); @@ -241,6 +241,13 @@ std::string_view StripQuotes(std::string_view s) return s; } +// Turns "\n\rhello" into " hello". +void ReplaceBreaksWithSpaces(std::string& str) +{ + std::replace(str.begin(), str.end(), '\r', ' '); + std::replace(str.begin(), str.end(), '\n', ' '); +} + bool TryParse(const std::string& str, bool* const output) { float value; -- cgit v1.2.3