Merge pull request #1437 from MediaBrowser/dev

Merge from dev

1 files changed, 17 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
index fd74b68b8..9ebf82c02 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs
@@ -191,6 +191,23 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers
                     video.IsHD = true;
                 }
             }
+
+            SetIsoType(video);
+        }
+
+        protected void SetIsoType(Video video)
+        {
+            if (video.VideoType == VideoType.Iso)
+            {
+                if (video.Path.IndexOf("dvd", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    video.IsoType = IsoType.Dvd;
+                }
+                else if (video.Path.IndexOf("bluray", StringComparison.OrdinalIgnoreCase) != -1)
+                {
+                    video.IsoType = IsoType.BluRay;
+                }
+            }
         }
 
         protected void Set3DFormat(Video video, bool is3D, string format3D)