Ignore FormatException when decrypting and it wasn't encrypted.

dapplo · Sep 22, 2015 · 979ec28 · 979ec28
1 parent cfe8df2
commit 979ec28
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Dapplo.Config/Converters/StringEncryptionTypeConverter.cs b/Dapplo.Config/Converters/StringEncryptionTypeConverter.cs
@@ -171,7 +171,14 @@ public override object ConvertFrom(ITypeDescriptorContext context, System.Global
 			string valueString = value as string;
 			if (!string.IsNullOrWhiteSpace(valueString))
 			{
-				return Decrypt(valueString);
+				// Try to decrypt, ignore FormatException
+				try
+				{
+					return Decrypt(valueString);
+				} catch (FormatException)
+				{
+					return valueString;
+                }
 			}
 			if (valueString != null)
 			{