Merge pull request #1874 from MediaBrowser/dev

Dev

1 files changed, 5 insertions, 14 deletions

diff --git a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
index 7390fbbbc4..ec1ccbff57 100644
--- a/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
+++ b/MediaBrowser.Server.Startup.Common/ApplicationHost.cs
@@ -587,8 +587,11 @@ namespace MediaBrowser.Server.Startup.Common
             RegisterSingleInstance(SubtitleEncoder);
 
             await displayPreferencesRepo.Initialize().ConfigureAwait(false);
-            await ConfigureUserDataRepositories().ConfigureAwait(false);
-            await itemRepo.Initialize().ConfigureAwait(false);
+
+            var userDataRepo = new SqliteUserDataRepository(LogManager, ApplicationPaths, NativeApp.GetDbConnector());
+
+            ((UserDataManager)UserDataManager).Repository = userDataRepo;
+            await itemRepo.Initialize(userDataRepo).ConfigureAwait(false);
             ((LibraryManager)LibraryManager).ItemRepository = ItemRepository;
             await ConfigureNotificationsRepository().ConfigureAwait(false);
             progress.Report(100);
@@ -752,18 +755,6 @@ namespace MediaBrowser.Server.Startup.Common
         }
 
         /// <summary>
-        /// Configures the user data repositories.
-        /// </summary>
-        private async Task ConfigureUserDataRepositories()
-        {
-            var repo = new SqliteUserDataRepository(LogManager, ApplicationPaths, NativeApp.GetDbConnector());
-
-            await repo.Initialize().ConfigureAwait(false);
-
-            ((UserDataManager)UserDataManager).Repository = repo;
-        }
-
-        /// <summary>
         /// Dirty hacks
         /// </summary>
         private void SetStaticProperties()