p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue -carla-settings command giving error if no -carla-settings provided

This commit is contained in:
nsubiron 2017-06-04 13:29:12 +02:00
parent ab381487fd
commit 224c4d7695
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Carla/Game/CarlaSettings.cpp
View File

@ -123,15 +123,15 @@ static void LoadSettingsFromConfig(
}
}
static FString GetSettingsFilePathFromCommandLine()
static bool GetSettingsFilePathFromCommandLine(FString &Value)
{
FString Value;
if (FParse::Value(FCommandLine::Get(), TEXT("-carla-settings="), Value)) {
if (FPaths::IsRelative(Value)) {
Value = FPaths::ConvertRelativePathToFull(FPaths::LaunchDir(), Value);
return true;
}
}
return Value;
return false;
}
// =============================================================================
@ -144,7 +144,12 @@ void UCarlaSettings::LoadSettings()
// Load settings from project Config folder if present.
LoadSettingsFromFile(FPaths::Combine(FPaths::GameConfigDir(), TEXT("CarlaSettings.ini")), false);
// Load settings given by command-line arg if provided.
LoadSettingsFromFile(GetSettingsFilePathFromCommandLine(), true);
{
FString FilePath;
if (GetSettingsFilePathFromCommandLine(FilePath)) {
LoadSettingsFromFile(FilePath, true);
}
}
// Override settings from command-line.
{
uint32 Value;