alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-19 22:20:33 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix up some merge errors

Browse Source
This commit is contained in:
ebr11 Eric Reed spam
2012-09-17 16:53:39 -04:00
parent f385fe2f20
commit 9fbd88a713
4 changed files with 5 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Kernel.cs
View File

@@ -124,6 +124,7 @@ namespace MediaBrowser.Controller
progress.Report(new TaskProgress { Description = "Loading Media Library" });
await ReloadRoot(allowInternetProviders: false).ConfigureAwait(false);
}
/// <summary>
@@ -137,8 +138,6 @@ namespace MediaBrowser.Controller
DisposeWeatherClient();
ItemController.PreBeginResolvePath -= ItemController_PreBeginResolvePath;
ItemController.BeginResolvePath -= ItemController_BeginResolvePath;
}
protected override void OnComposablePartsLoaded()
@@ -188,6 +187,7 @@ namespace MediaBrowser.Controller
DirectoryWatchers.Stop();
RootFolder = await ItemController.GetItem(MediaRootFolderPath, allowInternetProviders: allowInternetProviders).ConfigureAwait(false) as Folder;
RootFolder.ChildrenChanged += RootFolder_ChildrenChanged;
DirectoryWatchers.Start();
}