Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

2 files changed, 22 insertions, 5 deletions

diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index d264b896d2..65b837eac9 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -319,10 +319,13 @@ namespace MediaBrowser.Api.Images
 
                 try
                 {
-                    var size = _imageProcessor.GetImageSize(info);
+                    if (info.IsLocalFile)
+                    {
+                        var size = _imageProcessor.GetImageSize(info);
 
-                    width = Convert.ToInt32(size.Width);
-                    height = Convert.ToInt32(size.Height);
+                        width = Convert.ToInt32(size.Width);
+                        height = Convert.ToInt32(size.Height);
+                    }
                 }
                 catch
                 {
diff --git a/MediaBrowser.Api/Social/SharingService.cs b/MediaBrowser.Api/Social/SharingService.cs
index 608008455d..7d61c24ecb 100644
--- a/MediaBrowser.Api/Social/SharingService.cs
+++ b/MediaBrowser.Api/Social/SharingService.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Api.Social
             Task.WaitAll(task);
         }
 
-        public object Get(GetShareImage request)
+        public async Task<object> Get(GetShareImage request)
         {
             var share = _sharingManager.GetShareInfo(request.Id);
 
@@ -143,7 +143,21 @@ namespace MediaBrowser.Api.Social
 
             if (image != null)
             {
-                return ToStaticFileResult(image.Path);
+                if (image.IsLocalFile)
+                {
+                    return ToStaticFileResult(image.Path);
+                }
+
+                try
+                {
+                    // Don't fail the request over this
+                    var updatedImage = await _libraryManager.ConvertImageToLocal(item, image, 0).ConfigureAwait(false);
+                    return ToStaticFileResult(updatedImage.Path);
+                }
+                catch
+                {
+                    
+                }
             }
 
             // Grab a dlna icon if nothing else is available