From b89aaed7854212926729aabb4a05d5b517cb5549 Mon Sep 17 00:00:00 2001
From: among-us-official <110939205+among-us-official@users.noreply.github.com>
Date: Thu, 11 Aug 2022 23:46:12 +0300
Subject: [PATCH] Fix corrupted icons in second column (#1088)

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 Open-Shell/Open-Shell-Menu#980
---
 Src/StartMenu/StartMenuDLL/MenuContainer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
index efdeef8..29413dd 100644
--- a/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
+++ b/Src/StartMenu/StartMenuDLL/MenuContainer.cpp
@@ -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);