From 673746621f7ed792c41dcd888a5b6e47b17ca2cb Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 10 May 2016 12:18:05 -0400
Subject: fix DeviceDiscovery

---
 MediaBrowser.Server.Implementations/Library/UserDataManager.cs | 9 +++++----
 MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs   | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
index 0fabbf54a..f637160be 100644
--- a/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserDataManager.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -199,22 +200,22 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public UserItemData GetUserData(IHasUserData user, IHasUserData item)
         {
-            return GetUserData(user.Id, item.GetUserDataKey());
+            return GetUserData(user.Id, item.GetUserDataKeys().First());
         }
 
         public UserItemData GetUserData(string userId, IHasUserData item)
         {
-            return GetUserData(userId, item.GetUserDataKey());
+            return GetUserData(userId, item.GetUserDataKeys().First());
         }
 
         public UserItemData GetUserData(Guid userId, IHasUserData item)
         {
-            return GetUserData(userId, item.GetUserDataKey());
+            return GetUserData(userId, item.GetUserDataKeys().First());
         }
 
         public UserItemDataDto GetUserDataDto(IHasUserData item, User user)
         {
-            var userData = GetUserData(user.Id, item.GetUserDataKey());
+            var userData = GetUserData(user.Id, item.GetUserDataKeys().First());
             var dto = GetUserItemDataDto(userData);
 
             item.FillUserDataDtoValues(dto, userData, user);
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index 379e2f056..bbba06870 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -345,7 +345,8 @@ namespace MediaBrowser.Server.Implementations.Sync
 
                 if (!folder.IsPreSorted)
                 {
-                    items = items.OrderBy(i => i.SortName).ToArray();
+                    items = _libraryManager.Sort(items, user, new[] { ItemSortBy.SortName }, SortOrder.Ascending)
+                        .ToArray();
                 }
 
                 return items;
-- 
cgit v1.2.3