Merge pull request #2217 from MediaBrowser/dev

Dev

1 files changed, 11 insertions, 3 deletions

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 1e3ec22fd..1656d8304 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -1857,11 +1857,14 @@ namespace MediaBrowser.Server.Implementations.Persistence
             }
             index++;
 
-            if (!reader.IsDBNull(index))
+            if (query.DtoOptions.EnableImages)
             {
-                DeserializeImages(reader.GetString(index), item);
+                if (!reader.IsDBNull(index))
+                {
+                    DeserializeImages(reader.GetString(index), item);
+                }
+                index++;
             }
-            index++;
 
             if (query.HasField(ItemFields.ProductionLocations))
             {
@@ -2259,6 +2262,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 }
             }
 
+            if (!query.DtoOptions.EnableImages)
+            {
+                list.Remove("Images");
+            }
+
             if (EnableJoinUserData(query))
             {
                 list.Add("UserDataDb.UserData.UserId");