Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

If there are multiple escapes, pick the first.

Browse source
This commit is contained in:
Henrik Rydgård 2023-04-23 14:42:36 +02:00
parent 91d4ded3fd
commit 4ed634383f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Common/StringUtils.cpp
View file

@ -348,6 +348,7 @@ std::string UnescapeMenuString(const char *input, char *shortcutChar) {
std::string output;
output.reserve(len);
bool escaping = false;
bool escapeFound = false;
for (size_t i = 0; i < len; i++) {
if (input[i] == '&') {
if (escaping) {
@ -358,8 +359,9 @@ std::string UnescapeMenuString(const char *input, char *shortcutChar) {
}
} else {
output.push_back(input[i]);
if (escaping && shortcutChar) {
if (escaping && shortcutChar && !escapeFound) {
*shortcutChar = input[i];
escapeFound = true;
}
escaping = false;
}

3
unittest/UnitTest.cpp
View file

@ -908,6 +908,9 @@ bool TestEscapeMenuString() {
EXPECT_EQ_STR(temp, std::string("Edit"));
temp = UnescapeMenuString("Cut && Paste", nullptr);
EXPECT_EQ_STR(temp, std::string("Cut & Paste"));
temp = UnescapeMenuString("&A&B", &c);
EXPECT_EQ_STR(temp, std::string("AB"));
EXPECT_EQ_INT((int)c, (int)'A');
return true;
}