Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-07-09 03:04:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixing a bug on the merger

Browse Source
This commit is contained in:
Zoe Roux 2020-05-19 03:15:42 +02:00
parent 500ba56943
commit 087bc02dba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kyoo.Common/Models/Studio.cs
View File

@ -9,7 +9,7 @@ namespace Kyoo.Models
public string Slug { get; set; } public string Slug { get; set; }
public string Name { get; set; } public string Name { get; set; }
public virtual IEnumerable<Show> Shows { get; set; } [JsonIgnore] public virtual IEnumerable<Show> Shows { get; set; }
public Studio() { } public Studio() { }

2
Kyoo.Common/Utility.cs
View File

@ -111,7 +111,7 @@ namespace Kyoo
? Activator.CreateInstance(property.PropertyType) ? Activator.CreateInstance(property.PropertyType)
: null; : null;
if (oldValue?.Equals(defaultValue) == true) if (oldValue?.Equals(defaultValue) != false)
property.SetValue(first, newValue); property.SetValue(first, newValue);
else if (typeof(IEnumerable).IsAssignableFrom(property.PropertyType) else if (typeof(IEnumerable).IsAssignableFrom(property.PropertyType)
&& property.PropertyType != typeof(string)) && property.PropertyType != typeof(string))