From 5527b9f01e094cbfe1e0682aa566567253842008 Mon Sep 17 00:00:00 2001 From: cpw Date: Tue, 12 Aug 2014 09:16:15 -0400 Subject: [PATCH] Clear button list on FML fatal error screens. The hidden cancel button should not be there. Closes #497 --- .../java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java | 1 + fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java | 1 + fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java | 1 + fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java | 1 + 4 files changed, 4 insertions(+) diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java b/fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java index 8eab99af9c..894cdba226 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java +++ b/fml/src/main/java/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java @@ -26,6 +26,7 @@ public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen public void initGui() { super.initGui(); + this.buttonList.clear(); this.customException.initGui(this, fontRendererObj); } @Override diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java b/fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java index 7d3f129c32..410e12d233 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java +++ b/fml/src/main/java/cpw/mods/fml/client/GuiDupesFound.java @@ -34,6 +34,7 @@ public class GuiDupesFound extends GuiErrorScreen public void initGui() { super.initGui(); + this.buttonList.clear(); } @Override public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_) diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java b/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java index c2631f6346..9edb54fcea 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java +++ b/fml/src/main/java/cpw/mods/fml/client/GuiModsMissing.java @@ -32,6 +32,7 @@ public class GuiModsMissing extends GuiErrorScreen public void initGui() { super.initGui(); + this.buttonList.clear(); } @Override public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_) diff --git a/fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java b/fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java index b26fcecd90..e3586dccfb 100644 --- a/fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java +++ b/fml/src/main/java/cpw/mods/fml/client/GuiWrongMinecraft.java @@ -28,6 +28,7 @@ public class GuiWrongMinecraft extends GuiErrorScreen public void initGui() { super.initGui(); + this.buttonList.clear(); } @Override public void drawScreen(int p_73863_1_, int p_73863_2_, float p_73863_3_)