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

Merge pull request #11458 from reaperrr/fix-11457

Browse Source 
Fix conflict in ModContentLogic
This commit is contained in:
Oliver Brakmann
2016-06-16 19:37:11 +02:00
committed by GitHub
parent bc03c199f5 3c2a553f63
commit 16a18e8de1
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 discs = p.Value.Discs.Select(s => content.Discs[s].Title).Distinct();
var discList = discs.JoinWith("\n");
var discAvailable = discs.Any();
var isDiscAvailable = discs.Any();
discWidget.GetTooltipText = () => discList;
discWidget.IsVisible = () => discAvailable;
discWidget.IsVisible = () => isDiscAvailable;
var installed = p.Value.IsInstalled();
var downloadButton = container.Get<ButtonWidget>("DOWNLOAD");
@@ -115,7 +115,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var requiresDiscWidget = container.Get<LabelWidget>("REQUIRES_DISC");
requiresDiscWidget.IsVisible = () => !installed && !downloadEnabled;
if (!discAvailable)
if (!isDiscAvailable)
requiresDiscWidget.GetText = () => "Manual Install";
scrollPanel.AddChild(container);