diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-10 01:55:37 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-01-10 01:55:37 -0500 |
| commit | e97848289600570b489b6fdb608014b383772523 (patch) | |
| tree | 7e440e3267895f7ce161ac5ae3d5723e0894bd5f | |
| parent | 51b5e379d56eaa77ab0e93edcb87477f524bf804 (diff) | |
3.0.5482.4
| -rw-r--r-- | MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs index 261eb96c4..e68f005be 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs @@ -72,13 +72,13 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV } else { - if (args.HasParent<Series>()) - { - return null; - } - if (string.IsNullOrWhiteSpace(collectionType)) { + if (args.HasParent<Series>()) + { + return null; + } + if (args.Parent.IsRoot) { return null; diff --git a/MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs b/MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs index 068261ffd..c2925551b 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncScheduledTask.cs @@ -67,7 +67,7 @@ namespace MediaBrowser.Server.Implementations.Sync public bool IsHidden { - get { return false; } + get { return true; } } public bool IsEnabled diff --git a/SharedVersion.cs b/SharedVersion.cs index 65f786ceb..d681f2ca9 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5482.3")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5482.4")] |