Ignore buttons with empty text.

RequiDev · Aug 21, 2021 · 104e7c7 · 104e7c7
1 parent 7cfb1ff
commit 104e7c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ReModCE/Components/ButtonAdjustmentsComponent.cs b/ReModCE/Components/ButtonAdjustmentsComponent.cs
@@ -41,13 +41,16 @@ public override void OnUiManagerInit(UiManager uiManager)
                 var name = button.name;
                 if (name == "DevToolsButton") continue;
 
-                var text = button.gameObject.GetComponentsInDirectChildren<Text>();
-                if (text == null || text.Length == 0)
+                var texts = button.gameObject.GetComponentsInDirectChildren<Text>();
+                if (texts == null || texts.Length == 0)
                 {
                     continue;
                 }
 
-                CreateUiForButton(button.gameObject, text[0].text);
+                var text = texts[0];
+                if (text.text.Length == 0)
+                    return;
+                CreateUiForButton(button.gameObject, text.text);
             }
 
             CreateUiForButton(ExtendedQuickMenu.UserIconCameraButton.gameObject, "Camera Icon Button", size: false);

diff --git a/ReModCE/UI/ReQuickButton.cs b/ReModCE/UI/ReQuickButton.cs
@@ -32,7 +32,7 @@ public bool Interactable
 
         public ReQuickButton(Vector2 pos, string text, string tooltip, Action onClick, Transform parent = null) : base(ExtendedQuickMenu.ReportWorldButton.gameObject, parent, pos, $"{text}Button")
         {
-            Object.DestroyImmediate(GameObject.GetComponentsInChildren<Image>(true).First(a => a.transform != GameObject.transform));
+            Object.DestroyImmediate(RectTransform.Find("CLIcon"));
 
             _textComponent = GameObject.GetComponentInChildren<Text>();
             _textComponent.resizeTextForBestFit = true;