Skip to content

Commit

Permalink
Fix corrupted icons in second column
Browse files Browse the repository at this point in the history
Using skin with a different second column icon size, the icons would
become blank until 'Small icons' was toggled on and off;  restarting
turned them blank again.

The bool m_bTwoColumns is set after AddStandardItems, and is still
false since the constructor. As a workaround, use the value it is
assigned from InitWindowInternal instead.

Fix Open-Shell#980
  • Loading branch information
among-us-official committed Aug 9, 2022
1 parent 47cc2b2 commit 697ac4c
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 697ac4c

Please sign in to comment.