diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-10 07:18:28 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-10 07:18:28 +0100 |
| commit | a50acb40b8cab10f193cf762d0b364ebe4666129 (patch) | |
| tree | 262f7cd3531df15199e5ac857c49f7c943bcaf09 /src | |
| parent | Merge pull request #266 from yuriks/remove-ndma (diff) | |
| parent | Explicitly specify LE strings to iconv, fixes paths in Steel Diver (diff) | |
| download | yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.tar yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.tar.gz yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.tar.bz2 yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.tar.lz yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.tar.xz yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.tar.zst yuzu-a50acb40b8cab10f193cf762d0b364ebe4666129.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/string_util.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 7fb7ede5e..19e162c27 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -528,7 +528,7 @@ std::u16string UTF8ToUTF16(const std::string& input) { std::u16string result; - iconv_t const conv_desc = iconv_open("UTF-16", "UTF-8"); + iconv_t const conv_desc = iconv_open("UTF-16LE", "UTF-8"); if ((iconv_t)(-1) == conv_desc) { ERROR_LOG(COMMON, "Iconv initialization failure [UTF-8]: %s", strerror(errno)); @@ -582,7 +582,7 @@ std::u16string UTF8ToUTF16(const std::string& input) std::string UTF16ToUTF8(const std::u16string& input) { - return CodeToUTF8("UTF-16", input); + return CodeToUTF8("UTF-16LE", input); } std::string CP1252ToUTF8(const std::string& input) |