From 6ad2e861a02f9bf040c30f29db6232984de53d4a Mon Sep 17 00:00:00 2001 From: Darth Affe Date: Sun, 9 Jun 2019 19:25:02 +0200 Subject: [PATCH] Changed Settings-Serialization to work with hte new double-values in colors. Fixes #50 --- .../Configuration/ColorSerializer.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/KeyboardAudioVisualizer/Configuration/ColorSerializer.cs b/KeyboardAudioVisualizer/Configuration/ColorSerializer.cs index 8bff582..8d2054e 100644 --- a/KeyboardAudioVisualizer/Configuration/ColorSerializer.cs +++ b/KeyboardAudioVisualizer/Configuration/ColorSerializer.cs @@ -30,10 +30,16 @@ namespace KeyboardAudioVisualizer.Configuration public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) { JObject jsonObject = JObject.Load(reader); - return new Color(jsonObject.Property("A").Value.ToObject(), - jsonObject.Property("R").Value.ToObject(), - jsonObject.Property("G").Value.ToObject(), - jsonObject.Property("B").Value.ToObject()); + if (jsonObject.Property("A").Value.ToObject() > 1.0) //DarthAffe 09.06.2019: Convert old Settings + return new Color(jsonObject.Property("A").Value.ToObject(), + jsonObject.Property("R").Value.ToObject(), + jsonObject.Property("G").Value.ToObject(), + jsonObject.Property("B").Value.ToObject()); + else + return new Color(jsonObject.Property("A").Value.ToObject(), + jsonObject.Property("R").Value.ToObject(), + jsonObject.Property("G").Value.ToObject(), + jsonObject.Property("B").Value.ToObject()); } #endregion