Skip to content

fix small problem #8414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nameearly wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −9
Open

fix small problem #8414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Core/GDCore/Project/Project.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1157,8 +1157,6 @@ void Project::SerializeTo(SerializerElement& element) const {
// end of compatibility code

extensionProperties.SerializeTo(propElement.AddChild("extensionProperties"));

playableDevicesElement.AddChild("").SetStringValue("mobile");

SerializerElement& platformsElement = propElement.AddChild("platforms");
platformsElement.ConsiderAsArrayOf("platform");
Expand Down
23 changes: 16 additions & 7 deletions Core/GDCore/String.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,18 +433,27 @@ String& String::Normalize(String::NormForm form)
{
unsigned char *newStr = nullptr;

if(form == NFD)
switch (form) {
case NFD:
newStr = utf8proc_NFD((unsigned char*)m_string.c_str());
else if(form == NFC)
break;
case NFC:
newStr = utf8proc_NFC((unsigned char*)m_string.c_str());
else if(form == NFKD)
break;
case NFKD:
newStr = utf8proc_NFKD((unsigned char*)m_string.c_str());
else if(form == NFKC)
break;
case NFKC:
newStr = utf8proc_NFKC((unsigned char*)m_string.c_str());
break;
default:
return *this;
}

m_string = (char*)newStr;

free(newStr);
if (newStr != nullptr) {
m_string = (char*)newStr;
free(newStr);
}

return *this;
}
Expand Down