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/WinUpdater/WinUI.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/WinUpdater/WinUI.cpp')
| -rw-r--r-- | Source/Core/WinUpdater/WinUI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/WinUpdater/WinUI.cpp b/Source/Core/WinUpdater/WinUI.cpp index 403f539b18..b972114f72 100644 --- a/Source/Core/WinUpdater/WinUI.cpp +++ b/Source/Core/WinUpdater/WinUI.cpp @@ -180,7 +180,7 @@ void ResetCurrentProgress() void Error(const std::string& text) { - auto wide_text = UTF8ToUTF16(text); + auto wide_text = UTF8ToWString(text); MessageBox(nullptr, (L"A fatal error occured and the updater cannot continue:\n " + wide_text).c_str(), @@ -200,7 +200,7 @@ void SetCurrentProgress(int current, int total) void SetDescription(const std::string& text) { - SetWindowText(label_handle, UTF8ToUTF16(text).c_str()); + SetWindowText(label_handle, UTF8ToWString(text).c_str()); } void MessageLoop() @@ -256,7 +256,7 @@ void LaunchApplication(std::string path) { // Hack: Launching the updater over the explorer ensures that admin priviliges are dropped. Why? // Ask Microsoft. - ShellExecuteW(nullptr, nullptr, L"explorer.exe", UTF8ToUTF16(path).c_str(), nullptr, SW_SHOW); + ShellExecuteW(nullptr, nullptr, L"explorer.exe", UTF8ToWString(path).c_str(), nullptr, SW_SHOW); } void Sleep(int sleep) |