izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

UBT: Fix parsing of nullable arguments passed via command line arguments.

Browse Source 
#rb none
[fyi] pj.kack
#rnx

(ushell-p4-cherrypick of 8382982 by Ben.Marsh)

[CL 8395389 by PJ Kack in Dev-Core branch]
This commit is contained in:
PJ Kack
2019-09-02 02:31:02 -04:00
parent feb8dcf960
commit f074937e40
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Programs/DotNETCommon/DotNETUtilities/CommandLineArguments.cs
+9 -2
View File
@@ -593,11 +593,18 @@ namespace Tools.DotNETCommon
IEnumerable<CommandLineAttribute> Attributes = FieldInfo.GetCustomAttributes<CommandLineAttribute>();
foreach(CommandLineAttribute Attribute in Attributes)
{
// Get the inner field type, unwrapping nullable types
Type ValueType = FieldInfo.FieldType;
if(ValueType.IsGenericType && ValueType.GetGenericTypeDefinition() == typeof(Nullable<>))
{
ValueType = ValueType.GetGenericArguments()[0];
}
// Get the appropriate prefix for this attribute
string Prefix = Attribute.Prefix;
if(Prefix == null)
{
if(FieldInfo.FieldType == typeof(bool))
if(ValueType == typeof(bool))
{
Prefix = String.Format("-{0}", FieldInfo.Name);
}
@@ -608,7 +615,7 @@ namespace Tools.DotNETCommon
}
else
{
if(FieldInfo.FieldType != typeof(bool) && Attribute.Value == null && !Prefix.EndsWith("=") && !Prefix.EndsWith(":"))
if(ValueType != typeof(bool) && Attribute.Value == null && !Prefix.EndsWith("=") && !Prefix.EndsWith(":"))
{
Prefix = Prefix + "=";
}