diff options
| -rw-r--r-- | MediaBrowser.Controller/Entities/UserView.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj | 1 | ||||
| -rw-r--r-- | MediaBrowser.ServerApplication/Native/WindowsApp.cs | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs index f4577435f..f8d5e1868 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 8758e2916..3b4b52af3 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -22,6 +22,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>true</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> diff --git a/MediaBrowser.ServerApplication/Native/WindowsApp.cs b/MediaBrowser.ServerApplication/Native/WindowsApp.cs index a89fcd926..bff342d01 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<Assembly>(); - list.Add(typeof(PismoIsoManager).Assembly); + if (!System.Environment.Is64BitProcess) + { + list.Add(typeof(PismoIsoManager).Assembly); + } list.Add(GetType().Assembly); |