Fix for property class

2014-10-11 10:32:01 +03:00 · 2014-10-11 10:32:01 +03:00 · ba0101374e
parent e1d286d0e0
commit ba0101374e
1 changed files with 7 additions and 1 deletions
--- a/RainmeterStudio.Core/Model/Property.cs
+++ b/RainmeterStudio.Core/Model/Property.cs
@ -61,7 +61,13 @@ namespace RainmeterStudio.Core.Model
            set
            {
                // Test if type changed
-                bool typeChanged = (_value.GetType() != value.GetType());
+                bool typeChanged;
+                
+                if (_value == null || value == null)
+                    typeChanged = (_value != null) || (value != null);
+                        
+                else
+                    typeChanged = (_value.GetType() != value.GetType());

                // Set value
                _value = value;