From 3da1640ac98857bcfdd98e78a55640cf70b6dfe9 Mon Sep 17 00:00:00 2001 From: ArkadySK Date: Thu, 23 May 2024 10:48:18 +0200 Subject: [PATCH] fixed crash --- GbxMapBrowser/MapInfo.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/GbxMapBrowser/MapInfo.cs b/GbxMapBrowser/MapInfo.cs index b93664f..6969524 100644 --- a/GbxMapBrowser/MapInfo.cs +++ b/GbxMapBrowser/MapInfo.cs @@ -73,7 +73,11 @@ public MapInfo(string fullnamepath, bool basicInfoOnly) ? enviImagePath : new Uri(Environment.CurrentDirectory + "\\Data\\Environments\\Unknown.png"); - bool isRace = challenge.Mode == CGameCtnChallenge.PlayMode.Race || challenge.MapType.EndsWith("Race"); + MapType = string.IsNullOrEmpty(challenge.ChallengeParameters?.MapType) + ? challenge.Mode.ToString() + : challenge.ChallengeParameters.MapType; + + bool isRace = challenge.Mode == CGameCtnChallenge.PlayMode.Race || MapType.EndsWith("Race"); ObjectiveAuthor = !string.IsNullOrEmpty(challenge.ObjectiveTextAuthor) && !isRace ? challenge.ObjectiveTextAuthor @@ -97,10 +101,6 @@ public MapInfo(string fullnamepath, bool basicInfoOnly) CopperPrice = challenge.Cost.ToString(); - MapType = string.IsNullOrEmpty(challenge.ChallengeParameters.MapType) - ? challenge.Mode.ToString() - : challenge.ChallengeParameters.MapType; - if (challenge.Thumbnail == null) { MapThumbnail = new BitmapImage(new Uri(Environment.CurrentDirectory + "\\Data\\UIIcons\\NoThumbnail.png"));