From fd3acd85e64c90f25b403e5232a4afa6b7a68733 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Thu, 5 Mar 2020 17:57:11 -0800
Subject: [PATCH] Fixed: Broken tasks getting stuck in queue

---
 .../Messaging/Commands/CommandExecutor.cs       | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
index f430aa4df..ee1946b1e 100644
--- a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
@@ -67,13 +67,15 @@ private void ExecuteCommands()
         private void ExecuteCommand<TCommand>(TCommand command, CommandModel commandModel)
             where TCommand : Command
         {
-            var handlerContract = typeof(IExecute<>).MakeGenericType(command.GetType());
-            var handler = (IExecute<TCommand>)_serviceFactory.Build(handlerContract);
-
-            _logger.Trace("{0} -> {1}", command.GetType().Name, handler.GetType().Name);
+            IExecute<TCommand> handler = null;
 
             try
             {
+                var handlerContract = typeof(IExecute<>).MakeGenericType(command.GetType());
+                handler = (IExecute<TCommand>)_serviceFactory.Build(handlerContract);
+
+                _logger.Trace("{0} -> {1}", command.GetType().Name, handler.GetType().Name);
+
                 _commandQueueManager.Start(commandModel);
                 BroadcastCommandUpdate(commandModel);
 
@@ -108,9 +110,12 @@ private void ExecuteCommand<TCommand>(TCommand command, CommandModel commandMode
                 {
                     ProgressMessageContext.CommandModel = null;
                 }
-            }
 
-            _logger.Trace("{0} <- {1} [{2}]", command.GetType().Name, handler.GetType().Name, commandModel.Duration.ToString());
+                if (handler != null)
+                {
+                    _logger.Trace("{0} <- {1} [{2}]", command.GetType().Name, handler.GetType().Name, commandModel.Duration.ToString());
+                }
+            }
         }
 
         private void BroadcastCommandUpdate(CommandModel command)