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

Tooltip is a conditional trait.

Browse Source 
Fix Analyzer warning: V3146 Possible null dereference.
This commit is contained in:
Matthias Mailänder
2020-09-12 14:51:58 +02:00
committed by Paul Chote
parent 8d7e5f4663
commit 0e39cc7829
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Cnc/Traits/Disguise.cs
View File

@@ -189,7 +189,10 @@ namespace OpenRA.Mods.Cnc.Traits
}
else
{
var tooltip = target.TraitsImplementing<ITooltip>().FirstOrDefault();
var tooltip = target.TraitsImplementing<ITooltip>().FirstEnabledTraitOrDefault();
if (tooltip == null)
throw new ArgumentNullException("tooltip", "Missing tooltip or invalid target.");
AsPlayer = tooltip.Owner;
AsActor = target.Info;
AsTooltipInfo = tooltip.TooltipInfo;
@@ -213,7 +216,7 @@ namespace OpenRA.Mods.Cnc.Traits
AsPlayer = newOwner;
AsActor = actorInfo;
AsTooltipInfo = actorInfo.TraitInfos<TooltipInfo>().FirstOrDefault();
AsTooltipInfo = actorInfo.TraitInfos<TooltipInfo>().FirstOrDefault(info => info.EnabledByDefault);
HandleDisguise(oldEffectiveActor, oldEffectiveOwner, oldDisguiseSetting);
}