diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs index f4577435f2..f8d5e18680 100644 --- a/MediaBrowser.Controller/Entities/UserView.cs +++ b/MediaBrowser.Controller/Entities/UserView.cs @@ -84,7 +84,8 @@ namespace MediaBrowser.Controller.Entities CollectionType.HomeVideos, CollectionType.Photos, CollectionType.Playlists, - CollectionType.BoxSets + CollectionType.BoxSets, + CollectionType.MusicVideos }; var collectionFolder = folder as ICollectionFolder; diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 8758e29168..3b4b52af3e 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -22,6 +22,7 @@ DEBUG;TRACE prompt 4 + true AnyCPU diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs index a89fcd9266..bff342d01f 100644 --- a/MediaBrowser.ServerApplication/Native/WindowsApp.cs +++ b/MediaBrowser.ServerApplication/Native/WindowsApp.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.IO; -using MediaBrowser.Common.Net; +using MediaBrowser.Common.Net; using MediaBrowser.IsoMounter; using MediaBrowser.Model.Logging; using MediaBrowser.Server.Startup.Common; @@ -23,7 +22,10 @@ namespace MediaBrowser.ServerApplication.Native { var list = new List(); - list.Add(typeof(PismoIsoManager).Assembly); + if (!System.Environment.Is64BitProcess) + { + list.Add(typeof(PismoIsoManager).Assembly); + } list.Add(GetType().Assembly);