alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-13 13:46:24 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

rework settings page

Browse Source
This commit is contained in:
Luke Pulverenti
2015-07-28 15:42:24 -04:00
parent 713a9e779b
commit d95057f13b
9 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
View File

@@ -1,4 +1,5 @@
using MediaBrowser.Common.IO;
using System.ComponentModel;
using MediaBrowser.Common.IO;
using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
@@ -338,7 +339,7 @@ namespace MediaBrowser.Server.Implementations.IO
}
catch
{
}
finally
{
@@ -370,6 +371,17 @@ namespace MediaBrowser.Server.Implementations.IO
Logger.ErrorException("Error in Directory watcher for: " + dw.Path, ex);
DisposeWatcher(dw);
if (ex is Win32Exception)
{
Logger.Info("Disabling realtime monitor to prevent future instability");
if (ConfigurationManager.Configuration.EnableLibraryMonitor == AutoOnOff.Auto)
{
ConfigurationManager.Configuration.EnableLibraryMonitor = AutoOnOff.Disabled;
Stop();
}
}
}
/// <summary>

15
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -2071,14 +2071,17 @@ namespace MediaBrowser.Server.Implementations.Library
public List<PersonInfo> GetPeople(BaseItem item)
{
var people = GetPeople(new InternalPeopleQuery
if (item.SupportsPeople)
{
ItemId = item.Id
});
var people = GetPeople(new InternalPeopleQuery
{
ItemId = item.Id
});
if (people.Count > 0)
{
return people;
if (people.Count > 0)
{
return people;
}
}
return item.People ?? new List<PersonInfo>();

4
MediaBrowser.Server.Implementations/Localization/Core/core.json
View File

@@ -173,7 +173,5 @@
"HeaderProducer": "Producers",
"HeaderWriter": "Writers",
"HeaderParentalRatings": "Parental Ratings",
"HeaderCommunityRatings": "Community ratings",
"HeaderCommunityRatings": "Community ratings"
}