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

add TrimOrEmpty to avoid NREs

Browse Source
This commit is contained in:
Matthias Mailänder
2014-05-17 13:31:37 +02:00
parent cc64b41246
commit dbb4132b66
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Exts.cs
View File

@@ -30,6 +30,11 @@ namespace OpenRA
return string.Format(fmt, args); return string.Format(fmt, args);
} }
public static string TrimOrEmpty(this string input)
{
return input != null ? input.Trim() : string.Empty;
}
public static T WithDefault<T>(T def, Func<T> f) public static T WithDefault<T>(T def, Func<T> f)
{ {
try { return f(); } try { return f(); }

6
OpenRA.Mods.RA/Widgets/Logic/InstallFromCDLogic.cs
View File

@@ -71,10 +71,10 @@ namespace OpenRA.Mods.RA.Widgets.Logic
installingContainer.IsVisible = () => true; installingContainer.IsVisible = () => true;
var dest = new string[] { Platform.SupportDir, "Content", Game.modData.Manifest.Mod.Id }.Aggregate(Path.Combine); var dest = new string[] { Platform.SupportDir, "Content", Game.modData.Manifest.Mod.Id }.Aggregate(Path.Combine);
var copyFiles = Game.modData.Manifest.ContentInstaller["CopyFilesFromCD"].Split(',').Select(x => x.Trim()).ToArray(); var copyFiles = Game.modData.Manifest.ContentInstaller["CopyFilesFromCD"].Split(',').Select(x => x.TrimOrEmpty()).ToArray();
var extractPackage = Game.modData.Manifest.ContentInstaller["PackageToExtractFromCD"].Trim(); var extractPackage = Game.modData.Manifest.ContentInstaller["PackageToExtractFromCD"].TrimOrEmpty();
var extractFiles = Game.modData.Manifest.ContentInstaller["ExtractFilesFromCD"].Split(',').Select(x => x.Trim()).ToArray(); var extractFiles = Game.modData.Manifest.ContentInstaller["ExtractFilesFromCD"].Split(',').Select(x => x.TrimOrEmpty()).ToArray();
var installCounter = 0; var installCounter = 0;
var installTotal = copyFiles.Count() + extractFiles.Count(); var installTotal = copyFiles.Count() + extractFiles.Count();