diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-06-20 16:48:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 16:48:48 +0200 |
| commit | beb3896d7fba09e038b45c784273dbea1e48013c (patch) | |
| tree | 55e9c9102f67e11ac0225c25166c2e4caaf012eb /MediaBrowser.Controller/Library/ItemResolveArgs.cs | |
| parent | e8e5208fbd9484a1b37eed5dece524f108886fe0 (diff) | |
| parent | 6556bec646a28d08267f30640125865cf42240d0 (diff) | |
Merge pull request #3390 from telans/fixes
Multiple warning fixes
Diffstat (limited to 'MediaBrowser.Controller/Library/ItemResolveArgs.cs')
| -rw-r--r-- | MediaBrowser.Controller/Library/ItemResolveArgs.cs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs index 92473eaa1..2e5dcc4c5 100644 --- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs @@ -42,7 +42,7 @@ namespace MediaBrowser.Controller.Library public LibraryOptions GetLibraryOptions() { - return LibraryOptions ?? (LibraryOptions = (Parent == null ? new LibraryOptions() : BaseItem.LibraryManager.GetLibraryOptions(Parent))); + return LibraryOptions ?? (LibraryOptions = Parent == null ? new LibraryOptions() : BaseItem.LibraryManager.GetLibraryOptions(Parent)); } /// <summary> @@ -224,8 +224,6 @@ namespace MediaBrowser.Controller.Library public string CollectionType { get; set; } - #region Equality Overrides - /// <summary> /// Determines whether the specified <see cref="object" /> is equal to this instance. /// </summary> @@ -254,14 +252,15 @@ namespace MediaBrowser.Controller.Library { if (args != null) { - if (args.Path == null && Path == null) return true; + if (args.Path == null && Path == null) + { + return true; + } + return args.Path != null && BaseItem.FileSystem.AreEqual(args.Path, Path); } return false; } - - #endregion } - } |
