aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Emby.Server.Implementations/Data/SqliteItemRepository.cs25
1 files changed, 22 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 67aa6cc3b..727a9c4bb 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1122,7 +1122,9 @@ namespace Emby.Server.Implementations.Data
return null;
}
- return string.Join("|", images.Select(ToValueString).ToArray());
+ var imageStrings = images.Where(i => !string.IsNullOrWhiteSpace(i.Path)).Select(ToValueString).ToArray();
+
+ return string.Join("|", imageStrings);
}
private void DeserializeImages(string value, BaseItem item)
@@ -1141,7 +1143,12 @@ namespace Emby.Server.Implementations.Data
foreach (var part in parts)
{
- item.ImageInfos.Add(ItemImageInfoFromValueString(part));
+ var image = ItemImageInfoFromValueString(part);
+
+ if (image != null)
+ {
+ item.ImageInfos.Add(image);
+ }
}
}
@@ -1149,7 +1156,14 @@ namespace Emby.Server.Implementations.Data
{
var delimeter = "*";
- return (image.Path ?? string.Empty) +
+ var path = image.Path;
+
+ if (path == null)
+ {
+ path = string.Empty;
+ }
+
+ return path +
delimeter +
image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) +
delimeter +
@@ -1162,6 +1176,11 @@ namespace Emby.Server.Implementations.Data
{
var parts = value.Split(new[] { '*' }, StringSplitOptions.None);
+ if (parts.Length != 4)
+ {
+ return null;
+ }
+
var image = new ItemImageInfo();
image.Path = parts[0];