mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-27 23:08:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8905 from JosJuice/jni-encoding

Browse source 
Android: Use correct encoding when converting strings
This commit is contained in:
LC 2020-07-18 22:13:14 -04:00 • committed by GitHub
commit 487cd7abd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 63 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Common/Timer.cpp
View file

@ -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);