starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

3.2.24.1

Browse Source
This commit is contained in:
Luke Pulverenti
2017-07-10 03:37:00 -04:00
parent 1c1aa7c2c5
commit 07ab6a19e2
6 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Emby.Common.Implementations/BaseApplicationHost.cs
View File

@@ -169,14 +169,15 @@ namespace Emby.Common.Implementations
{
_deviceId = new DeviceId(ApplicationPaths, LogManager.GetLogger("SystemId"), FileSystemManager);
}
return _deviceId.Value;
}
}
public PackageVersionClass SystemUpdateLevel
{
get {
get
{
#if BETA
return PackageVersionClass.Beta;
@@ -216,7 +217,7 @@ namespace Emby.Common.Implementations
// hack alert, until common can target .net core
BaseExtensions.CryptographyProvider = CryptographyProvider;
XmlSerializer = new MyXmlSerializer(fileSystem, logManager.GetLogger("XmlSerializer"));
FailedAssemblies = new List<string>();
@@ -565,7 +566,10 @@ namespace Emby.Common.Implementations
try
{
return assembly.GetTypes();
// This null checking really shouldn't be needed but adding it due to some
// unhandled exceptions in mono 5.0 that are a little hard to hunt down
var types = assembly.GetTypes() ?? new Type[] { };
return types.Where(t => t != null);
}
catch (ReflectionTypeLoadException ex)
{
@@ -578,7 +582,14 @@ namespace Emby.Common.Implementations
}
// If it fails we can still get a list of the Types it was able to resolve
return ex.Types.Where(t => t != null);
var types = ex.Types ?? new Type[] { };
return types.Where(t => t != null);
}
catch (Exception ex)
{
Logger.ErrorException("Error loading types from assembly", ex);
return new List<Type>();
}
}