Merge pull request #25 from jellyfin/master

Update my master

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
     }
-
 }