mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Use std::string for player name

Browse Source 
Removes memory leak.
This commit is contained in:
Ted John
2017-07-22 09:48:34 +01:00
parent ea87e87750
commit 354a26a9d2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/config/Config.cpp
View File

@@ -347,13 +347,13 @@ namespace Config
{
// If the `player_name` setting is missing or equal to the empty string
// use the logged-in user's username instead
utf8* playerName = reader->GetCString("player_name", "");
if (String::IsNullOrEmpty(playerName))
auto playerName = reader->GetString("player_name", "");
if (playerName.empty())
{
playerName = String::Duplicate(platform_get_username());
if (playerName == nullptr)
playerName = String::ToStd(platform_get_username());
if (playerName.empty())
{
playerName = String::Duplicate("Player");
playerName = "Player";
}
}
@@ -362,7 +362,7 @@ namespace Config
playerName = String::Trim(playerName);
auto model = &gConfigNetwork;
model->player_name = playerName;
model->player_name = String::Duplicate(playerName);
model->default_port = reader->GetSint32("default_port", NETWORK_DEFAULT_PORT);
model->listen_address = reader->GetCString("listen_address", "");
model->default_password = reader->GetCString("default_password", nullptr);