Merge pull request #10222 from Bond-009/photos

2 files changed, 3 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/Resolvers/IItemResolver.cs b/MediaBrowser.Controller/Resolvers/IItemResolver.cs
index b95d00aa3..282aa721e 100644
--- a/MediaBrowser.Controller/Resolvers/IItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/IItemResolver.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Resolvers
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns>BaseItem.</returns>
-        BaseItem ResolvePath(ItemResolveArgs args);
+        BaseItem? ResolvePath(ItemResolveArgs args);
     }
 
     public interface IMultiItemResolver
diff --git a/MediaBrowser.Controller/Resolvers/ItemResolver.cs b/MediaBrowser.Controller/Resolvers/ItemResolver.cs
index a6da8384e..5c9dd6f07 100644
--- a/MediaBrowser.Controller/Resolvers/ItemResolver.cs
+++ b/MediaBrowser.Controller/Resolvers/ItemResolver.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 
@@ -23,7 +21,7 @@ namespace MediaBrowser.Controller.Resolvers
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns>`0.</returns>
-        protected internal virtual T Resolve(ItemResolveArgs args)
+        protected internal virtual T? Resolve(ItemResolveArgs args)
         {
             return null;
         }
@@ -42,7 +40,7 @@ namespace MediaBrowser.Controller.Resolvers
         /// </summary>
         /// <param name="args">The args.</param>
         /// <returns>BaseItem.</returns>
-        public BaseItem ResolvePath(ItemResolveArgs args)
+        public BaseItem? ResolvePath(ItemResolveArgs args)
         {
             var item = Resolve(args);