Skip to content

Commit

Permalink
Fix corrupted icons in second column (#1088)
Browse files Browse the repository at this point in the history
When using skin with a different second column icon size, all of the
icons in it would become blank.

Because m_bTwoColumns is set after AddStandardItems, it is still false
in the column break check. As a workaround, use the value it's assigned
later in InitWindowInternal instead.

Fix #980
  • Loading branch information
among-us-official committed Aug 11, 2022
1 parent 47cc2b2 commit b89aaed
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Src/StartMenu/StartMenuDLL/MenuContainer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,8 @@ void CMenuContainer::AddStandardItems( void )
if (m_bSubMenu && pStdItem->id==s_ShutdownCommand)
continue;

if (pStdItem->id==MENU_COLUMN_BREAK && m_bTwoColumns)
const bool bTwoColumns = (!m_bSubMenu && s_Skin.TwoColumns);
if (pStdItem->id==MENU_COLUMN_BREAK && bTwoColumns)
mainIconSize=s_Skin.Main2_icon_size;

int stdOptions=GetStdOptions(pStdItem->id);
Expand Down

0 comments on commit b89aaed

Please sign in to comment.