From 96d1408d45e48b4f154ab76dcd2733c1b8236486 Mon Sep 17 00:00:00 2001
From: geckosoft <tv2knet@gmail.com>
Date: Thu, 30 Sep 2010 06:14:48 +0200
Subject: [PATCH] Fixed crash bug #197

---
 OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
index 3965fb4af2..abbadfa974 100644
--- a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
+++ b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs
@@ -125,6 +125,10 @@ namespace OpenRA.Widgets.Delegates
 		{
 			var r = Widget.RootWidget;
 			var bg = r.GetWidget("JOINSERVER_BG");
+
+            if (bg == null) // We got a MasterServer reply AFTER the browser is gone, just return to prevent crash - Gecko
+                return;
+
 			var sl = bg.GetWidget<ListBoxWidget>("SERVER_LIST");
 
 			sl.Children.Clear();