From 86a787bdf9df5ef54cf38bfd16ae24c73bd9e83c Mon Sep 17 00:00:00 2001
From: 34will <wgilmour@hotmail.co.uk>
Date: Thu, 11 Jan 2018 19:54:16 +0000
Subject: [PATCH] Modified StringUtil to change UTF16ToUTF8 to use a
 wstring_convert and codecvt_utf8<wchar_t> to convert a UTF16 wstring to a
 UTF8 string.

---
 Source/Core/Common/StringUtil.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
index e2a7b7cfb7..8ac8a4a229 100644
--- a/Source/Core/Common/StringUtil.cpp
+++ b/Source/Core/Common/StringUtil.cpp
@@ -29,6 +29,7 @@
 constexpr u32 CODEPAGE_SHIFT_JIS = 932;
 constexpr u32 CODEPAGE_WINDOWS_1252 = 1252;
 #else
+#include <codecvt>
 #include <errno.h>
 #include <iconv.h>
 #include <locale.h>
@@ -564,7 +565,8 @@ std::string UTF8ToSHIFTJIS(const std::string& input)
 
 std::string UTF16ToUTF8(const std::wstring& input)
 {
-  return CodeToUTF8("UTF-16LE", input);
+  std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
+  return converter.to_bytes(input);
 }
 
 std::string UTF16BEToUTF8(const char16_t* str, size_t max_size)