From 4328f24276aa361e2cfef6ddeb4ea96cb7c94b26 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 5 Feb 2016 21:35:21 +0000 Subject: [PATCH] Remove unnecessary Map usage from MissionBrowserLogic. --- OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs index 0165fe7f15..5600281d3c 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs @@ -40,6 +40,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic readonly ScrollItemWidget template; MapPreview selectedMapPreview; + Map selectedMap; PlayingVideo playingVideo; @@ -161,16 +162,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic void SelectMap(Map map) { + selectedMap = map; selectedMapPreview = Game.ModData.MapCache[map.Uid]; // Cache the rules on a background thread to avoid jank new Thread(selectedMapPreview.CacheRules).Start(); - var briefingVideo = selectedMapPreview.Map.Videos.Briefing; + var briefingVideo = map.Videos.Briefing; var briefingVideoVisible = briefingVideo != null; var briefingVideoDisabled = !(briefingVideoVisible && Game.ModData.ModFiles.Exists(briefingVideo)); - var infoVideo = selectedMapPreview.Map.Videos.BackgroundInfo; + var infoVideo = map.Videos.BackgroundInfo; var infoVideoVisible = infoVideo != null; var infoVideoDisabled = !(infoVideoVisible && Game.ModData.ModFiles.Exists(infoVideo)); @@ -291,7 +293,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (selectedMapPreview.RuleStatus != MapRuleStatus.Cached) return; - var gameStartVideo = selectedMapPreview.Map.Videos.GameStart; + var gameStartVideo = selectedMap.Videos.GameStart; if (gameStartVideo != null && Game.ModData.ModFiles.Exists(gameStartVideo)) { var fsPlayer = fullscreenVideoPlayer.Get("PLAYER");