epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Throw a sane exception when trying to load an invalid widget.

Browse Source
This commit is contained in:
Paul Chote
2011-05-05 23:03:17 +12:00
parent 178e4664c7
commit 388324dd69
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Game/Widgets/WidgetLoader.cs
View File

@@ -12,6 +12,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.FileFormats; using OpenRA.FileFormats;
using OpenRA.Widgets; using OpenRA.Widgets;
using System.IO;
namespace OpenRA namespace OpenRA
{ {
@@ -28,7 +29,11 @@ namespace OpenRA
public Widget LoadWidget( Dictionary<string, object> args, Widget parent, string w ) public Widget LoadWidget( Dictionary<string, object> args, Widget parent, string w )
{ {
return LoadWidget( args, parent, widgets[ w ] ); MiniYamlNode ret;
if (!widgets.TryGetValue(w, out ret))
throw new InvalidDataException("Cannot find widget with Id `{0}`".F(w));
return LoadWidget( args, parent, ret );
} }
public Widget LoadWidget( Dictionary<string, object> args, Widget parent, MiniYamlNode node) public Widget LoadWidget( Dictionary<string, object> args, Widget parent, MiniYamlNode node)