update playlist drag and drop

3 files changed, 22 insertions, 4 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index a880914a3e..5c0b5e5b24 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -1748,8 +1748,6 @@ namespace MediaBrowser.Server.Implementations.Dto
                 return;
             }
 
-            var path = imageInfo.Path;
-
             ImageSize size;
 
             try
diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
index 47ec47f8f6..37ee2b3190 100644
--- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs
@@ -248,6 +248,11 @@ namespace MediaBrowser.Server.Implementations.Photos
 
             if (image != null)
             {
+                if (!image.IsLocalFile)
+                {
+                    return false;
+                }
+
                 if (!FileSystem.ContainsSubPath(item.GetInternalMetadataPath(), image.Path))
                 {
                     return false;
@@ -269,6 +274,11 @@ namespace MediaBrowser.Server.Implementations.Photos
 
             if (image != null)
             {
+                if (!image.IsLocalFile)
+                {
+                    return false;
+                }
+
                 if (!FileSystem.ContainsSubPath(item.GetInternalMetadataPath(), image.Path))
                 {
                     return false;
diff --git a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
index e43978fa0a..d9b3ed7551 100644
--- a/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
+++ b/MediaBrowser.Server.Implementations/Playlists/PlaylistManager.cs
@@ -111,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
             try
             {
-				_fileSystem.CreateDirectory(path);
+                _fileSystem.CreateDirectory(path);
 
                 var playlist = new Playlist
                 {
@@ -151,7 +151,7 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
         private string GetTargetPath(string path)
         {
-			while (_fileSystem.DirectoryExists(path))
+            while (_fileSystem.DirectoryExists(path))
             {
                 path += "1";
             }
@@ -243,6 +243,16 @@ namespace MediaBrowser.Server.Implementations.Playlists
 
             var oldIndex = children.FindIndex(i => string.Equals(entryId, i.Item1.Id, StringComparison.OrdinalIgnoreCase));
 
+            if (oldIndex == newIndex)
+            {
+                return;
+            }
+
+            if (newIndex > oldIndex)
+            {
+                newIndex--;
+            }
+
             var item = playlist.LinkedChildren[oldIndex];
 
             playlist.LinkedChildren.Remove(item);