Load badges on the main thread.

This commit is contained in:
Paul Chote
2020-02-22 17:39:40 +00:00
committed by Matthias Mailänder
parent e877bb1206
commit 7d17916e3f

View File

@@ -35,19 +35,20 @@ namespace OpenRA
var badgesNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Badges"); var badgesNode = yaml.Nodes.FirstOrDefault(n => n.Key == "Badges");
if (badgesNode != null) if (badgesNode != null)
{ {
try var playerDatabase = Game.ModData.Manifest.Get<PlayerDatabase>();
foreach (var badgeNode in badgesNode.Value.Nodes)
{ {
var playerDatabase = Game.ModData.Manifest.Get<PlayerDatabase>(); Game.RunAfterTick(() =>
foreach (var badgeNode in badgesNode.Value.Nodes)
{ {
var badge = playerDatabase.LoadBadge(badgeNode.Value); // Discard badge on error
if (badge != null) try
badges.Add(badge); {
} var badge = playerDatabase.LoadBadge(badgeNode.Value);
} if (badge != null)
catch badges.Add(badge);
{ }
// Discard badges on error catch { }
});
} }
} }