Merge pull request #6335 from obrakmann/fix6311

Fix end game window conflicting with ingame menu
2014-09-03 18:54:51 +12:00
parent 31e0ed7001 2f4c81b7c9
commit 674998c0ee
5 changed files with 13 additions and 7 deletions
--- a/OpenRA.Game/Widgets/Widget.cs
+++ b/OpenRA.Game/Widgets/Widget.cs
@@ -417,8 +417,11 @@ namespace OpenRA.Widgets

 		public virtual void RemoveChild(Widget child)
 		{
-			Children.Remove(child);
-			child.Removed();
+			if (child != null)
+			{
+				Children.Remove(child);
+				child.Removed();
+			}
 		}

 		public virtual void RemoveChildren()