From d90494f204f013c2a078c769a4cde948a327b23c Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 23 Dec 2016 14:35:05 -0500 Subject: update naming project --- MediaBrowser.Model/Configuration/ServerConfiguration.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'MediaBrowser.Model/Configuration') diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 493fe1bd2..22713b94f 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -462,11 +462,9 @@ namespace MediaBrowser.Model.Configuration Type = ImageType.Art }, - // Don't download this by default - // Generally not used new ImageOption { - Limit = 0, + Limit = 1, Type = ImageType.Logo } }, @@ -556,7 +554,7 @@ namespace MediaBrowser.Model.Configuration Type = ImageType.Thumb } }, - DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" } + DisabledMetadataFetchers = new []{ "TheMovieDb" } }, new MetadataOptions(0, 1280) @@ -577,8 +575,8 @@ namespace MediaBrowser.Model.Configuration Type = ImageType.Primary } }, - DisabledMetadataFetchers = new []{ "The Open Movie Database" }, - DisabledImageFetchers = new []{ "TheMovieDb" } + DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" }, + DisabledImageFetchers = new []{ "The Open Movie Database", "TheMovieDb" } } }; } -- cgit v1.2.3 From 8999198cca1f3808f01672f6126e72df598ec24e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Dec 2016 02:25:35 -0500 Subject: update connect error responses --- Emby.Server.Implementations/Connect/ConnectManager.cs | 4 ++-- MediaBrowser.Model/Configuration/UserConfiguration.cs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Model/Configuration') diff --git a/Emby.Server.Implementations/Connect/ConnectManager.cs b/Emby.Server.Implementations/Connect/ConnectManager.cs index b7faaa901..8c8b7b026 100644 --- a/Emby.Server.Implementations/Connect/ConnectManager.cs +++ b/Emby.Server.Implementations/Connect/ConnectManager.cs @@ -570,9 +570,9 @@ namespace Emby.Server.Implementations.Connect } catch (HttpException ex) { - if (!ex.StatusCode.HasValue) + if (!ex.StatusCode.HasValue || ex.IsTimedOut) { - throw; + throw new Exception("Unable to invite guest, " + ex.Message, ex); } // If they entered a username, then whatever the error is just throw it, for example, user not found diff --git a/MediaBrowser.Model/Configuration/UserConfiguration.cs b/MediaBrowser.Model/Configuration/UserConfiguration.cs index a4a88f169..efd3d6b67 100644 --- a/MediaBrowser.Model/Configuration/UserConfiguration.cs +++ b/MediaBrowser.Model/Configuration/UserConfiguration.cs @@ -27,7 +27,6 @@ namespace MediaBrowser.Model.Configuration public bool DisplayMissingEpisodes { get; set; } public bool DisplayUnairedEpisodes { get; set; } - public string[] ExcludeFoldersFromGrouping { get; set; } public string[] GroupedFolders { get; set; } public SubtitlePlaybackMode SubtitleMode { get; set; } -- cgit v1.2.3