From 3a5d04f82402acf5163c756e31a748dc76e1cde8 Mon Sep 17 00:00:00 2001 From: steelphase Date: Mon, 29 Sep 2014 23:07:48 -0400 Subject: [PATCH] LoadWidget modRules Fix Fixes #6625 --- OpenRA.Game/Widgets/WidgetLoader.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Game/Widgets/WidgetLoader.cs b/OpenRA.Game/Widgets/WidgetLoader.cs index 7b1eaba04e..2b5680db15 100644 --- a/OpenRA.Game/Widgets/WidgetLoader.cs +++ b/OpenRA.Game/Widgets/WidgetLoader.cs @@ -45,6 +45,9 @@ namespace OpenRA public Widget LoadWidget(WidgetArgs args, Widget parent, MiniYamlNode node) { + if (!args.ContainsKey("modRules")) + args = new WidgetArgs(args) { { "modRules", modData.DefaultRules } }; + var widget = NewWidget(node.Key, args); if (parent != null) @@ -57,8 +60,6 @@ namespace OpenRA if (child.Key != "Children") FieldLoader.LoadField(widget, child.Key, child.Value.Value); - if (!args.ContainsKey("modRules")) - args = new WidgetArgs(args) { { "modRules", modData.DefaultRules } }; widget.Initialize(args); foreach (var child in node.Value.Nodes)