Merge pull request #8905 from JosJuice/jni-encoding

Android: Use correct encoding when converting strings
This commit is contained in:
LC 2020-07-18 22:13:14 -04:00 committed by GitHub
commit 487cd7abd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 63 additions and 42 deletions

View file

@ -38,7 +38,7 @@ std::string GetDeviceName(const LPDIRECTINPUTDEVICE8 device)
std::string result;
if (SUCCEEDED(device->GetProperty(DIPROP_PRODUCTNAME, &str.diph)))
{
result = StripSpaces(UTF16ToUTF8(str.wsz));
result = StripSpaces(WStringToUTF8(str.wsz));
}
else
{