From 35e79d1979baceb5d97ade8a22d8a36f40ec2c41 Mon Sep 17 00:00:00 2001 From: gibbed Date: Sun, 4 Aug 2019 21:54:50 -0500 Subject: [PATCH] [Base] Fix checks in cvar string escaping. --- src/xenia/base/cvar.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xenia/base/cvar.cc b/src/xenia/base/cvar.cc index ef3b645da..6b65d79e8 100644 --- a/src/xenia/base/cvar.cc +++ b/src/xenia/base/cvar.cc @@ -159,9 +159,9 @@ std::string EscapeString(const std::string& val) { "\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F" "'" "\x7F"; - if (val.find_first_of("\r\n") == std::string::npos) { + if (val.find_first_of(multiline_chars) == std::string::npos) { // single line - if (val.find_first_of(multiline_chars) == std::string::npos) { + if (val.find_first_of(escape_chars) == std::string::npos) { return "'" + val + "'"; } else { return "\"" + toml::EscapeBasicString(val) + "\"";