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

Added null check for m_font (#801)

Browse Source
This commit is contained in:
Terry Michaels
2021-05-18 11:42:31 -05:00
committed by GitHub
parent aab4b4a126
commit 8cfe16c06f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/UiTextComponent.cpp
+7 -6
View File
@@ -3568,13 +3568,14 @@ UiTextComponent::FontEffectComboBoxVec UiTextComponent::PopulateFontEffectList()
FontEffectComboBoxVec result;
AZStd::vector<AZ::EntityId> entityIdList;
// there is always a valid font since we default to "default-ui"
// so just get the effects from the font and add their names to the result list
unsigned int numEffects = m_font->GetNumEffects();
for (int i = 0; i < numEffects; ++i)
if (m_font)
{
const char* name = m_font->GetEffectName(i);
result.push_back(AZStd::make_pair(i, name));
unsigned int numEffects = m_font->GetNumEffects();
for (int i = 0; i < numEffects; ++i)
{
const char* name = m_font->GetEffectName(i);
result.push_back(AZStd::make_pair(i, name));
}
}
return result;