From d95c0e8324284b7391fb1d6a275c8af18508141b Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 14 Sep 2016 17:34:19 -0400
Subject: fix web socket session creation

---
 .../Library/LibraryManager.cs                                | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index bd408c9d3..1f8c77953 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -695,7 +695,7 @@ namespace MediaBrowser.Server.Implementations.Library
 
         public IEnumerable<BaseItem> ResolvePaths(IEnumerable<FileSystemMetadata> files,
             IDirectoryService directoryService,
-            Folder parent, 
+            Folder parent,
             LibraryOptions libraryOptions,
             string collectionType,
             IItemResolver[] resolvers)
@@ -1490,10 +1490,10 @@ namespace MediaBrowser.Server.Implementations.Library
 
         private void AddUserToQuery(InternalItemsQuery query, User user)
         {
-            if (query.AncestorIds.Length == 0 && 
-                !query.ParentId.HasValue && 
-                query.ChannelIds.Length == 0 && 
-                query.TopParentIds.Length == 0 && 
+            if (query.AncestorIds.Length == 0 &&
+                !query.ParentId.HasValue &&
+                query.ChannelIds.Length == 0 &&
+                query.TopParentIds.Length == 0 &&
                 string.IsNullOrWhiteSpace(query.AncestorWithPresentationUniqueKey)
                 && query.ItemIds.Length == 0)
             {
@@ -2552,7 +2552,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 throw new ArgumentNullException("to");
             }
 
-            var newPath = path.Replace(from, to, StringComparison.OrdinalIgnoreCase);
+            var newPath = path.Replace(from.Trim(), to.Trim(), StringComparison.OrdinalIgnoreCase);
 
             if (!string.Equals(newPath, path))
             {
-- 
cgit v1.2.3