Merge pull request #10409 from Mailaender/fix-globalchat

Fixed all known crashes in GlobalChat
2016-01-04 15:42:14 +01:00
parent e4f4c578f6 83bada07b5
commit bb399a536b
2 changed files with 14 additions and 3 deletions
--- a/OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs
@@ -379,6 +379,9 @@ namespace OpenRA.Mods.Common.Widgets

 		void BindingAddImpl(object item)
 		{
+			if (makeWidget == null)
+				return;
+
 			var widget = makeWidget(item);
 			var scrollToBottom = autoScroll && ScrolledToBottom;