summaryrefslogtreecommitdiffstats
path: root/src/common/string_util.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-12-10 07:06:53 +0100
committerarchshift <admin@archshift.com>2014-12-10 07:07:28 +0100
commit4763fca9f82274de22422c6e6b27aa69401454c2 (patch)
tree262f7cd3531df15199e5ac857c49f7c943bcaf09 /src/common/string_util.cpp
parentMerge pull request #266 from yuriks/remove-ndma (diff)
downloadyuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar
yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.gz
yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.bz2
yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.lz
yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.xz
yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.zst
yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.zip
Diffstat (limited to 'src/common/string_util.cpp')
-rw-r--r--src/common/string_util.cpp4
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)