diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-07-17 11:05:08 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-07-17 11:05:08 -0400 |
| commit | b14214775e153bc6228ad8a8f887b7fa6fc59f57 (patch) | |
| tree | 6092f3439aa35fcaf3e67aa222a4e8121c97287e | |
| parent | 8a4a5f8a3ba36b6cbffec0ea28420ec4fae32e6a (diff) | |
3.2.25.7
| -rw-r--r-- | Emby.Common.Implementations/BaseApplicationHost.cs | 11 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Localization/Ratings/nz.txt | 5 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/Emby.Common.Implementations/BaseApplicationHost.cs b/Emby.Common.Implementations/BaseApplicationHost.cs index 7e0fd23b5..e7710162c 100644 --- a/Emby.Common.Implementations/BaseApplicationHost.cs +++ b/Emby.Common.Implementations/BaseApplicationHost.cs @@ -557,7 +557,7 @@ namespace Emby.Common.Implementations /// <param name="assembly">The assembly.</param> /// <returns>IEnumerable{Type}.</returns> /// <exception cref="System.ArgumentNullException">assembly</exception> - protected IEnumerable<Type> GetTypes(Assembly assembly) + protected List<Type> GetTypes(Assembly assembly) { if (assembly == null) { @@ -569,7 +569,7 @@ namespace Emby.Common.Implementations // 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); + return types.Where(t => t != null).ToList(); } catch (ReflectionTypeLoadException ex) { @@ -577,13 +577,16 @@ namespace Emby.Common.Implementations { foreach (var loaderException in ex.LoaderExceptions) { - Logger.Error("LoaderException: " + loaderException.Message); + if (loaderException != null) + { + Logger.Error("LoaderException: " + loaderException.Message); + } } } // If it fails we can still get a list of the Types it was able to resolve var types = ex.Types ?? new Type[] { }; - return types.Where(t => t != null); + return types.Where(t => t != null).ToList(); } catch (Exception ex) { diff --git a/Emby.Server.Implementations/Localization/Ratings/nz.txt b/Emby.Server.Implementations/Localization/Ratings/nz.txt index bc761dcab..cb2b878ff 100644 --- a/Emby.Server.Implementations/Localization/Ratings/nz.txt +++ b/Emby.Server.Implementations/Localization/Ratings/nz.txt @@ -1,10 +1,11 @@ NZ-G,1 NZ-PG,5 -NZ-M,9 NZ-R13,7 NZ-R15,8 NZ-R16,9 NZ-R18,10 NZ-RP13,7 NZ-RP16,9 -NZ-R,10
\ No newline at end of file +NZ-R,10 +NZ-M,10 +NZ-MA,10
\ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 22055dcf1..a576941ab 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.25.6")] +[assembly: AssemblyVersion("3.2.25.7")] |