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

Fix conflict in ModContentLogic

Browse Source 
The variable would otherwise conflict with the declaration at line 24.
This commit is contained in:
reaperrr
2016-06-16 15:15:28 +02:00
parent bc03c199f5
commit 3c2a553f63
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Installation/ModContentLogic.cs
View File

@@ -89,9 +89,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var discWidget = container.Get<ImageWidget>("DISC"); var discWidget = container.Get<ImageWidget>("DISC");
var discs = p.Value.Discs.Select(s => content.Discs[s].Title).Distinct(); var discs = p.Value.Discs.Select(s => content.Discs[s].Title).Distinct();
var discList = discs.JoinWith("\n"); var discList = discs.JoinWith("\n");
var discAvailable = discs.Any(); var isDiscAvailable = discs.Any();
discWidget.GetTooltipText = () => discList; discWidget.GetTooltipText = () => discList;
discWidget.IsVisible = () => discAvailable; discWidget.IsVisible = () => isDiscAvailable;
var installed = p.Value.IsInstalled(); var installed = p.Value.IsInstalled();
var downloadButton = container.Get<ButtonWidget>("DOWNLOAD"); var downloadButton = container.Get<ButtonWidget>("DOWNLOAD");
@@ -115,7 +115,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var requiresDiscWidget = container.Get<LabelWidget>("REQUIRES_DISC"); var requiresDiscWidget = container.Get<LabelWidget>("REQUIRES_DISC");
requiresDiscWidget.IsVisible = () => !installed && !downloadEnabled; requiresDiscWidget.IsVisible = () => !installed && !downloadEnabled;
if (!discAvailable) if (!isDiscAvailable)
requiresDiscWidget.GetText = () => "Manual Install"; requiresDiscWidget.GetText = () => "Manual Install";
scrollPanel.AddChild(container); scrollPanel.AddChild(container);