Merge pull request #2897 from MediaBrowser/beta

Beta

1 files changed, 10 insertions, 1 deletions

diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 44cc60b50..6152ea20b 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -518,9 +518,18 @@ namespace MediaBrowser.Api.Library
                 LogDownload(item, user, auth);
             }
 
+            var path = item.Path;
+
+            // Quotes are valid in linux. They'll possibly cause issues here
+            var filename = (Path.GetFileName(path) ?? string.Empty).Replace("\"", string.Empty);
+            if (!string.IsNullOrWhiteSpace(filename))
+            {
+                headers["Content-Disposition"] = "attachment; filename=\"" + filename + "\"";
+            }
+
             return ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions
             {
-                Path = item.Path,
+                Path = path,
                 ResponseHeaders = headers
             });
         }