From 4ff0f090bb472c9b0342b6f0ec61dc5147331974 Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 23 Sep 2016 22:10:45 +0200 Subject: [PATCH] Fixed optimize error. --- GreenshotPlugin/IniFile/IniValue.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/GreenshotPlugin/IniFile/IniValue.cs b/GreenshotPlugin/IniFile/IniValue.cs index 21d61644d..b01e87f19 100644 --- a/GreenshotPlugin/IniFile/IniValue.cs +++ b/GreenshotPlugin/IniFile/IniValue.cs @@ -140,8 +140,13 @@ namespace Greenshot.IniFile { public Type ValueType { get { var valueType = _propertyInfo?.PropertyType ?? _fieldInfo.FieldType; + if (!valueType.IsGenericType) + { + return valueType; + } var genericTypeDefinition = valueType.GetGenericTypeDefinition(); - if (genericTypeDefinition != null && (valueType.IsGenericType && genericTypeDefinition == typeof(Nullable<>))) { + if (genericTypeDefinition != null && genericTypeDefinition == typeof(Nullable<>)) + { // We are dealing with a generic type that is nullable valueType = Nullable.GetUnderlyingType(valueType); } @@ -286,8 +291,8 @@ namespace Greenshot.IniFile { return; } } else if (!string.IsNullOrEmpty(propertyValue)) { - var genericTypeDefinition = valueType.GetGenericTypeDefinition(); - if (genericTypeDefinition != null && (valueType.IsGenericType && genericTypeDefinition == typeof(Nullable<>))) { + if (valueType.IsGenericType && valueType.GetGenericTypeDefinition() == typeof(Nullable<>)) + { // We are dealing with a generic type that is nullable valueType = Nullable.GetUnderlyingType(valueType); }