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

Integrating latest from github/staging

Browse Source 
Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp
+4 -12
View File
@@ -20,7 +20,7 @@
#include <AzCore/Slice/SliceAsset.h>
#include <AzCore/XML/rapidxml_print.h>
#include <AzCore/Asset/AssetManager.h>
#include <AzCore/Settings/SettingsRegistryMergeUtils.h>
#include <AzCore/Utils/Utils.h>
#include <AzFramework/Asset/AssetSystemComponent.h>
#include <AzFramework/StringFunc/StringFunc.h>
@@ -762,18 +762,10 @@ namespace SliceFavorites
QString FavoriteDataModel::GetProjectName()
{
AZStd::string gameFolder;
auto settingsRegistry = AZ::SettingsRegistry::Get();
auto gameFolderKey = AZ::SettingsRegistryInterface::FixedValueString::format("%s/%s",
AZ::SettingsRegistryMergeUtils::BootstrapSettingsRootKey, AzFramework::AssetSystem::ProjectName);
if (settingsRegistry)
AZ::SettingsRegistryInterface::FixedValueString projectName = AZ::Utils::GetProjectName();
if (!projectName.empty())
{
settingsRegistry->Get(gameFolder, gameFolderKey);
}
if (!gameFolder.empty())
{
return gameFolder.c_str();
return QString::fromUtf8(projectName.c_str(), aznumeric_cast<int>(projectName.size()));
}
return "unknown";