From 99084edabeb1787f28496dffa55fbb260e34ae81 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 8 May 2016 23:13:38 -0400
Subject: update windows ffmpeg

---
 .../Sorting/DateLastMediaAddedComparer.cs                         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs')

diff --git a/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
index 68cd44ec94..5c51f5e0fc 100644
--- a/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
@@ -49,10 +49,10 @@ namespace MediaBrowser.Server.Implementations.Sorting
 
             if (folder != null)
             {
-                return folder.GetRecursiveChildren(User, i => !i.IsFolder)
-                    .Select(i => i.DateCreated)
-                    .OrderByDescending(i => i)
-                    .FirstOrDefault();
+                if (folder.DateLastMediaAdded.HasValue)
+                {
+                    return folder.DateLastMediaAdded.Value;
+                }
             }
 
             return x.DateCreated;
-- 
cgit v1.2.3


From 75b699fc4e2c78d4753c644d422d8a5e600ab7ce Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 9 May 2016 15:27:38 -0400
Subject: rework tabs

---
 MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs | 2 +-
 .../Sorting/DateLastMediaAddedComparer.cs                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs')

diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 20cc7f82a9..6f83e5e064 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -852,7 +852,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                         UpdateAncestors(item.Id, item.GetAncestorIds().Distinct().ToList(), transaction);
                     }
 
-                    UpdateUserDataKeys(item.Id, item.GetUserDataKeys(), transaction);
+                    UpdateUserDataKeys(item.Id, item.GetUserDataKeys().Distinct(StringComparer.OrdinalIgnoreCase).ToList(), transaction);
                 }
 
                 transaction.Commit();
diff --git a/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs b/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
index 5c51f5e0fc..e8c78b8e73 100644
--- a/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DateLastMediaAddedComparer.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Implementations.Sorting
                 }
             }
 
-            return x.DateCreated;
+            return DateTime.MinValue;
         }
 
         /// <summary>
-- 
cgit v1.2.3