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/Common/Timer.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/Common/Timer.cpp')
| -rw-r--r-- | Source/Core/Common/Timer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/Common/Timer.cpp b/Source/Core/Common/Timer.cpp index 69188cd303..81fb792ff3 100644 --- a/Source/Core/Common/Timer.cpp +++ b/Source/Core/Common/Timer.cpp @@ -217,7 +217,7 @@ std::string Timer::GetTimeFormatted() #ifdef _WIN32 struct timeb tp; (void)::ftime(&tp); - return UTF16ToUTF8(tmp) + fmt::format(":{:03}", tp.millitm); + return WStringToUTF8(tmp) + fmt::format(":{:03}", tp.millitm); #elif defined __APPLE__ struct timeval t; (void)gettimeofday(&t, nullptr); @@ -255,7 +255,7 @@ std::string Timer::GetDateTimeFormatted(double time) #ifdef _WIN32 wchar_t tmp[32] = {}; wcsftime(tmp, sizeof(tmp), L"%x %X", localTime); - return UTF16ToUTF8(tmp); + return WStringToUTF8(tmp); #else char tmp[32] = {}; strftime(tmp, sizeof(tmp), "%x %X", localTime); |