From 07b9d2ae7e4b530adcda861d05fd253b19b19e8f Mon Sep 17 00:00:00 2001
From: raiti-chan <rusuke@t-net.ne.jp>
Date: Sun, 18 Dec 2022 19:02:55 +0900
Subject: [PATCH] isControlOnlyMenu flag changed to hasChildMenu flag. This one
 matches the early return.

---
 .../Editor/MenuTree.cs                        | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs b/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs
index 1d243e14..58c16de0 100644
--- a/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs
+++ b/Packages/nadena.dev.modular-avatar/Editor/MenuTree.cs
@@ -121,10 +121,10 @@ namespace nadena.dev.modular_avatar.core.editor
 			}
 
 			VRCExpressionsMenu[] parentsMenus = parents.DefaultIfEmpty(installer.installTargetMenu).ToArray();
-			bool isControlOnlyMenu = true;
+			bool hasChildMenu = false;
 			foreach (KeyValuePair<string, VRCExpressionsMenu> childMenu in childMenus) 
 			{
-				isControlOnlyMenu = false;
+				hasChildMenu = true;
 				ChildElement childElement = new ChildElement 
 				{
 					menuName = childMenu.Key,
@@ -137,18 +137,17 @@ namespace nadena.dev.modular_avatar.core.editor
 					TraverseMenu(parentMenu, childElement);
 				}
 			}
-
-			if (!isControlOnlyMenu) return;
+			
+			if (hasChildMenu) return;
+			foreach (VRCExpressionsMenu parentMenu in parentsMenus) 
 			{
-				foreach (VRCExpressionsMenu parentMenu in parentsMenus) 
+				TraverseMenu(parentMenu, new ChildElement 
 				{
-					TraverseMenu(parentMenu, new ChildElement 
-					{
-						installer = installer,
-						isInstallerRoot = true
-					});
-				}
+					installer = installer,
+					isInstallerRoot = true
+				});
 			}
+			
 		}
 
 		private void TraverseMenu(VRCExpressionsMenu parent, ChildElement childElement)