mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
fix null reference issue when checking for updates
This commit is contained in:
parent
6d532640a9
commit
3aac1b543f
1 changed files with 10 additions and 6 deletions
|
@ -308,22 +308,26 @@ namespace MediaBrowser.Common.Implementations.Updates
|
||||||
|
|
||||||
protected IEnumerable<PackageVersionInfo> FilterCatalog(IEnumerable<PackageInfo> catalog, bool withAutoUpdateEnabled)
|
protected IEnumerable<PackageVersionInfo> FilterCatalog(IEnumerable<PackageInfo> catalog, bool withAutoUpdateEnabled)
|
||||||
{
|
{
|
||||||
var plugins = _applicationHost.Plugins;
|
var plugins = _applicationHost.Plugins.ToList();
|
||||||
|
|
||||||
if (withAutoUpdateEnabled)
|
if (withAutoUpdateEnabled)
|
||||||
{
|
{
|
||||||
plugins = plugins.Where(p => p.Configuration.EnableAutoUpdate);
|
plugins = plugins
|
||||||
|
.Where(p => p.Configuration.EnableAutoUpdate)
|
||||||
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Figure out what needs to be installed
|
// Figure out what needs to be installed
|
||||||
return plugins.Select(p =>
|
var packages = plugins.Select(p =>
|
||||||
{
|
{
|
||||||
var latestPluginInfo = GetLatestCompatibleVersion(catalog, p.Name, p.Configuration.UpdateClass);
|
var latestPluginInfo = GetLatestCompatibleVersion(catalog, p.Name, p.Configuration.UpdateClass);
|
||||||
|
|
||||||
return latestPluginInfo != null && latestPluginInfo.version > p.Version ? latestPluginInfo : null;
|
return latestPluginInfo != null && latestPluginInfo.version != null && latestPluginInfo.version > p.Version ? latestPluginInfo : null;
|
||||||
|
|
||||||
}).Where(p => !CompletedInstallations.Any(i => string.Equals(i.Name, p.name, StringComparison.OrdinalIgnoreCase)))
|
}).Where(i => i != null).ToList();
|
||||||
.Where(p => p != null && !string.IsNullOrWhiteSpace(p.sourceUrl));
|
|
||||||
|
return packages
|
||||||
|
.Where(p => !string.IsNullOrWhiteSpace(p.sourceUrl) && !CompletedInstallations.Any(i => string.Equals(i.Name, p.name, StringComparison.OrdinalIgnoreCase)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
Loading…
Reference in a new issue