diff options
| author |  archshift | 2014-12-09 22:06:53 -0800 |
|---|---|---|
| committer | archshift | 2014-12-09 22:07:28 -0800 |
| commit | 4763fca9f82274de22422c6e6b27aa69401454c2 (patch) | |
| tree | 262f7cd3531df15199e5ac857c49f7c943bcaf09 /src/common/string_util.cpp | |
| parent | Merge pull request #266 from yuriks/remove-ndma (diff) | |
| download | yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.gz yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.tar.xz yuzu-4763fca9f82274de22422c6e6b27aa69401454c2.zip | |
Explicitly specify LE strings to iconv, fixes paths in Steel Diver
Diffstat (limited to 'src/common/string_util.cpp')
| -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) | |||
| 528 | { | 528 | { |
| 529 | std::u16string result; | 529 | std::u16string result; |
| 530 | 530 | ||
| 531 | iconv_t const conv_desc = iconv_open("UTF-16", "UTF-8"); | 531 | iconv_t const conv_desc = iconv_open("UTF-16LE", "UTF-8"); |
| 532 | if ((iconv_t)(-1) == conv_desc) | 532 | if ((iconv_t)(-1) == conv_desc) |
| 533 | { | 533 | { |
| 534 | ERROR_LOG(COMMON, "Iconv initialization failure [UTF-8]: %s", strerror(errno)); | 534 | ERROR_LOG(COMMON, "Iconv initialization failure [UTF-8]: %s", strerror(errno)); |
| @@ -582,7 +582,7 @@ std::u16string UTF8ToUTF16(const std::string& input) | |||
| 582 | 582 | ||
| 583 | std::string UTF16ToUTF8(const std::u16string& input) | 583 | std::string UTF16ToUTF8(const std::u16string& input) |
| 584 | { | 584 | { |
| 585 | return CodeToUTF8("UTF-16", input); | 585 | return CodeToUTF8("UTF-16LE", input); |
| 586 | } | 586 | } |
| 587 | 587 | ||
| 588 | std::string CP1252ToUTF8(const std::string& input) | 588 | std::string CP1252ToUTF8(const std::string& input) |