From 07ab6a19e25b722513cf4731427ca04a08c6cb86 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 10 Jul 2017 03:37:00 -0400
Subject: 3.2.24.1

---
 Emby.Common.Implementations/BaseApplicationHost.cs | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'Emby.Common.Implementations/BaseApplicationHost.cs')

diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs
index d16afbce3..847eeca64 100644
--- a/Emby.Common.Implementations/BaseApplicationHost.cs
+++ b/Emby.Common.Implementations/BaseApplicationHost.cs
@@ -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>();
             }
         }
 
-- 
cgit v1.2.3