birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating up through commit 90f050496

Browse Source
This commit is contained in:
alexpete
2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AWSMetrics/Code/Source/IdentityProvider.cpp
+4 -4
View File
@@ -26,8 +26,8 @@ namespace AWSMetrics
AZStd::string IdentityProvider::GetEngineVersion()
{
static constexpr const char* ENGINE_CONFIG_FILE_PATH = "@root@/engine.json";
static constexpr const char* ENGINE_VERSION_JSON_KEY = "LumberyardVersion";
static constexpr const char* EngineConfigFilePath = "@root@/engine.json";
static constexpr const char* EngineVersionJsonKey = "LumberyardVersion";
AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetDirectInstance();
if (!fileIO)
@@ -37,7 +37,7 @@ namespace AWSMetrics
}
char resolvedPath[AZ_MAX_PATH_LEN] = { 0 };
if (!fileIO->ResolvePath(ENGINE_CONFIG_FILE_PATH, resolvedPath, AZ_MAX_PATH_LEN))
if (!fileIO->ResolvePath(EngineConfigFilePath, resolvedPath, AZ_MAX_PATH_LEN))
{
AZ_Error("AWSMetrics", false, "Failed to resolve the engine config file directory");
return "";
@@ -52,7 +52,7 @@ namespace AWSMetrics
}
rapidjson_ly::Document& jsonDoc = readOutcome.GetValue();
auto memberIt = jsonDoc.FindMember(ENGINE_VERSION_JSON_KEY);
auto memberIt = jsonDoc.FindMember(EngineVersionJsonKey);
if (memberIt != jsonDoc.MemberEnd())
{
return memberIt->value.GetString();