2 files changed, 24 insertions, 40 deletions

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
index 6ab3d1bb18..24f59478c5 100644
--- a/Emby.Server.Implementations/ApplicationHost.cs
+++ b/Emby.Server.Implementations/ApplicationHost.cs
@@ -202,10 +202,10 @@ namespace Emby.Server.Implementations
         /// Gets or sets all concrete types.
         /// </summary>
         /// <value>All concrete types.</value>
-        public Type[] AllConcreteTypes { get; protected set; }
+        private Type[] _allConcreteTypes;
 
         /// <summary>
-        /// The disposable parts
+        /// The disposable parts.
         /// </summary>
         private readonly List<IDisposable> _disposableParts = new List<IDisposable>();
 
@@ -499,7 +499,7 @@ namespace Emby.Server.Implementations
         {
             var currentType = typeof(T);
 
-            return AllConcreteTypes.Where(i => currentType.IsAssignableFrom(i));
+            return _allConcreteTypes.Where(i => currentType.IsAssignableFrom(i));
         }
 
         /// <inheritdoc />
@@ -1010,9 +1010,11 @@ namespace Emby.Server.Implementations
                         .Select(x => Assembly.LoadFrom(x))
                         .SelectMany(x => x.ExportedTypes)
                         .Where(x => x.IsClass && !x.IsAbstract && !x.IsInterface && !x.IsGenericType)
-                        .ToList();
+                        .ToArray();
 
-            types.AddRange(types);
+            int oldLen = _allConcreteTypes.Length;
+            Array.Resize(ref _allConcreteTypes, oldLen + types.Length);
+            types.CopyTo(_allConcreteTypes, oldLen);
 
             var plugins = types.Where(x => x.IsAssignableFrom(typeof(IPlugin)))
                     .Select(CreateInstanceSafe)
@@ -1022,8 +1024,8 @@ namespace Emby.Server.Implementations
                     .Where(x => x != null)
                     .ToArray();
 
-            int oldLen = _plugins.Length;
-            Array.Resize<IPlugin>(ref _plugins, _plugins.Length + plugins.Length);
+            oldLen = _plugins.Length;
+            Array.Resize(ref _plugins, oldLen + plugins.Length);
             plugins.CopyTo(_plugins, oldLen);
 
             var entries = types.Where(x => x.IsAssignableFrom(typeof(IServerEntryPoint)))
@@ -1140,7 +1142,7 @@ namespace Emby.Server.Implementations
         {
             Logger.LogInformation("Loading assemblies");
 
-            AllConcreteTypes = GetTypes(GetComposablePartAssemblies()).ToArray();
+            _allConcreteTypes = GetTypes(GetComposablePartAssemblies()).ToArray();
         }
 
         private IEnumerable<Type> GetTypes(IEnumerable<Assembly> assemblies)
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index 9a9bae2151..75efa7ec83 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -309,44 +309,26 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
             _hasExited = true;
 
-            DisposeLogStream();
+            _logFileStream?.Dispose();
+            _logFileStream = null;
 
-            try
-            {
-                var exitCode = process.ExitCode;
+            var exitCode = process.ExitCode;
 
-                _logger.LogInformation("FFMpeg recording exited with code {ExitCode} for {path}", exitCode, _targetPath);
+            _logger.LogInformation("FFMpeg recording exited with code {ExitCode} for {Path}", exitCode, _targetPath);
 
-                if (exitCode == 0)
-                {
-                    _taskCompletionSource.TrySetResult(true);
-                }
-                else
-                {
-                    _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {path} failed. Exit code {ExitCode}", _targetPath, exitCode)));
-                }
-            }
-            catch
+            if (exitCode == 0)
             {
-                _logger.LogError("FFMpeg recording exited with an error for {path}.", _targetPath);
-                _taskCompletionSource.TrySetException(new Exception(string.Format("Recording for {path} failed", _targetPath)));
+                _taskCompletionSource.TrySetResult(true);
             }
-        }
-
-        private void DisposeLogStream()
-        {
-            if (_logFileStream != null)
+            else
             {
-                try
-                {
-                    _logFileStream.Dispose();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error disposing recording log stream");
-                }
-
-                _logFileStream = null;
+                _taskCompletionSource.TrySetException(
+                    new Exception(
+                        string.Format(
+                            CultureInfo.InvariantCulture,
+                            "Recording for {0} failed. Exit code {1}",
+                            _targetPath,
+                            exitCode)));
             }
         }