@@ -27,7 +27,15 @@ internal abstract class Setting<T> : Setting
public new virtual T Value
{
- get => (T)base.Value;
+ get
+ {
+ if(base.Value != null && base.Value is not T value)
+ return default;
+ }
+
+ return (T)base.Value;
set
T oldValue = default;
@@ -44,7 +44,7 @@ internal abstract class Toolbar : ObservableObject, IToolbar
Setting setting = Settings.FirstOrDefault(currentSetting => string.Equals(currentSetting.Name, name, StringComparison.CurrentCultureIgnoreCase));
- if (setting is null || setting is not T convertedSetting)
+ if (setting is not T convertedSetting)
return null;
}