aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/Entities/Movies/Movie.cs13
1 files changed, 12 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 6ae4cf9f1..ec04879b5 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -125,7 +125,18 @@ namespace MediaBrowser.Controller.Entities.Movies
if (!DetectIsInMixedFolder())
{
- info.Name = System.IO.Path.GetFileName(ContainingFolderPath);
+ var name = System.IO.Path.GetFileName(ContainingFolderPath);
+
+ if (VideoType == VideoType.VideoFile || VideoType == VideoType.Iso)
+ {
+ if (string.Equals(name, System.IO.Path.GetFileName(Path), StringComparison.OrdinalIgnoreCase))
+ {
+ // if the folder has the file extension, strip it
+ name = System.IO.Path.GetFileNameWithoutExtension(name);
+ }
+ }
+
+ info.Name = name;
}
return info;