diff options
| author | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-17 16:53:39 -0400 |
|---|---|---|
| committer | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-17 16:53:39 -0400 |
| commit | 9fbd88a7131fd75722ae105ff114523c042eb497 (patch) | |
| tree | e3baaaa2a5283726c4d6188de35337ba022ead7f /MediaBrowser.Controller/Resolvers | |
| parent | f385fe2f201c6727b04acb4b8b57f2b9fc086dd4 (diff) | |
fix up some merge errors
Diffstat (limited to 'MediaBrowser.Controller/Resolvers')
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs index 8ac80f8986..e29af64f8d 100644 --- a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs @@ -68,7 +68,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies return new Movie()
{
Path = args.Path,
- VideoType = VideoType.DVD
+ VideoType = VideoType.Dvd
};
}
else if (args.IsBDFolder)
@@ -83,6 +83,7 @@ namespace MediaBrowser.Controller.Resolvers.Movies // Loop through each child file/folder and see if we find a video
foreach (var child in args.FileSystemChildren)
{
+ var childArgs = new ItemResolveEventArgs
{
FileInfo = child,
FileSystemChildren = new WIN32_FIND_DATA[] { },
|