From ee9ed99c7262ca381d5fe3bcac993d76a4088e5b Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 25 Oct 2015 07:47:47 +1100 Subject: [PATCH] Fix new launcher crashing when clicking 'yes' in ResourcesScreen, fixes #102 again. (Thanks Cheesse) --- Launcher2/Gui/Screens/ResourcesScreen.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Launcher2/Gui/Screens/ResourcesScreen.cs b/Launcher2/Gui/Screens/ResourcesScreen.cs index 0de43e3e0..15289ac1c 100644 --- a/Launcher2/Gui/Screens/ResourcesScreen.cs +++ b/Launcher2/Gui/Screens/ResourcesScreen.cs @@ -89,6 +89,13 @@ namespace Launcher2 { : (widgets[0] as LauncherLabelWidget).Text; MakeTextAt( statusFont, text, 0, 5 ); + // Clear the entire previous widgets state. + for( int i = 1; i < widgets.Length; i++ ) { + widgets[i] = null; + selectedWidget = null; + lastClicked = null; + } + if( fetcher == null ) { MakeTextAt( infoFont, mainText, 0, -30 ); MakeButtonAt( "Yes", 60, 30, textFont, Anchor.Centre, @@ -99,8 +106,6 @@ namespace Launcher2 { } else { MakeButtonAt( "Dismiss", 120, 30, textFont, Anchor.Centre, 0, 40, (x, y) => game.SetScreen( new MainScreen( game ) ) ); - widgets[2] = null; - widgets[3] = null; } }