diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-11-18 12:52:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-18 12:52:16 -0500 |
| commit | 9ff2d7590e7f34f26803cf658d20faeae6d9ecdb (patch) | |
| tree | 612092edc128b95ba04e4c309a0379ac22fcfe9c /MediaBrowser.Controller | |
| parent | 0accbd194a191ce750b48a00c8a4f00786fe187d (diff) | |
| parent | e0c72b605dbe124e111be9bff5cca442f86cf1ef (diff) | |
Merge pull request #2294 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/ImageRefreshOptions.cs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 08fcc0035..ffb6a7555 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -264,9 +264,9 @@ namespace MediaBrowser.Controller.LiveTv if (listings != null) { - if (!string.IsNullOrWhiteSpace(listings.MoviePrefix)) + if (!string.IsNullOrWhiteSpace(listings.MoviePrefix) && name.StartsWith(listings.MoviePrefix, StringComparison.OrdinalIgnoreCase)) { - name = name.Replace(listings.MoviePrefix, string.Empty, StringComparison.OrdinalIgnoreCase).Trim(); + name = name.Substring(listings.MoviePrefix.Length).Trim(); } } diff --git a/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs b/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs index 9b21a2972..691ce1ab0 100644 --- a/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs +++ b/MediaBrowser.Controller/Providers/ImageRefreshOptions.cs @@ -12,6 +12,7 @@ namespace MediaBrowser.Controller.Providers public List<ImageType> ReplaceImages { get; set; } public bool IsAutomated { get; set; } + public bool ForceEnableInternetMetadata { get; set; } public ImageRefreshOptions(IDirectoryService directoryService) { |