ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix encoding for default username

Browse Source
This commit is contained in:
Benau 2019-06-29 09:38:36 +08:00
parent 23c3736bd5
commit 4f1361b71f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/player_manager.cpp
View File

@ -346,7 +346,7 @@ void PlayerManager::enforceCurrentPlayer()
*/ */
void PlayerManager::addDefaultPlayer() void PlayerManager::addDefaultPlayer()
{ {
std::string username = "Player"; core::stringw username = "Player";
#if defined(WIN32) #if defined(WIN32)
std::vector<wchar_t> env; std::vector<wchar_t> env;
@ -354,7 +354,7 @@ void PlayerManager::addDefaultPlayer()
env.resize(32767, 0); env.resize(32767, 0);
DWORD length = GetEnvironmentVariable(L"USERNAME", env.data(), 32767); DWORD length = GetEnvironmentVariable(L"USERNAME", env.data(), 32767);
if (length != 0) if (length != 0)
username = StringUtils::wideToUtf8(env.data()); username = env.data();
#else #else
if (getenv("USER") != NULL) // Linux, Macs if (getenv("USER") != NULL) // Linux, Macs
username = getenv("USER"); username = getenv("USER");
@ -365,7 +365,7 @@ void PlayerManager::addDefaultPlayer()
// Set the name as the default name, but don't mark it as 'default' // Set the name as the default name, but don't mark it as 'default'
// yet, since not having a default player forces the player selection // yet, since not having a default player forces the player selection
// screen to be shown. // screen to be shown.
m_all_players.push_back(new Online::OnlinePlayerProfile(username.c_str()) ); m_all_players.push_back(new Online::OnlinePlayerProfile(username));
} // addDefaultPlayer } // addDefaultPlayer