diff options
| author | LC <mathew1800@gmail.com> | 2020-07-18 22:13:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-18 22:13:14 -0400 |
| commit | 487cd7abd9f13da2969a992b78b08e65f9e20d9f (patch) | |
| tree | 8477a16c66f16f5b5f25a40c1c730fa4e6544524 /Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | |
| parent | 5c2b6d06267df15b352ad75862575a2c83bf0ffb (diff) | |
| parent | f5da6e07d7405d89cc550b8c02f39a432f7888a3 (diff) | |
Merge pull request #8905 from JosJuice/jni-encoding
Android: Use correct encoding when converting strings
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp index 6afa98ac2d..2fc0e1b972 100644 --- a/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/DInput/DInput.cpp @@ -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 { |