From 8833f1ad31b9f88ab5733c307a4cf15b2f9716b0 Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Sun, 25 Jan 2015 21:10:49 +0100
Subject: [PATCH] Allow failing a Command using a specific message.

---
 src/NzbDrone.Core/Messaging/Commands/Command.cs         | 8 ++++----
 src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs | 6 +++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/NzbDrone.Core/Messaging/Commands/Command.cs b/src/NzbDrone.Core/Messaging/Commands/Command.cs
index 699770242..7e7777049 100644
--- a/src/NzbDrone.Core/Messaging/Commands/Command.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/Command.cs
@@ -60,21 +60,21 @@ namespace NzbDrone.Core.Messaging.Commands
             SetMessage("Starting");
         }
 
-        public void Failed(Exception exception)
+        public void Failed(Exception exception, string message = "Failed")
         {
             _stopWatch.Stop();
             StateChangeTime = DateTime.UtcNow;
             State = CommandStatus.Failed;
             Exception = exception;
-            SetMessage("Failed");
+            SetMessage(message);
         }
 
-        public void Completed()
+        public void Completed(string message = "Completed")
         {
             _stopWatch.Stop();
             StateChangeTime = DateTime.UtcNow;
             State = CommandStatus.Completed;
-            SetMessage("Completed");
+            SetMessage(message);
         }
 
         public void SetMessage(string message)
diff --git a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
index 2f3c72ee0..68ae2b1b4 100644
--- a/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
+++ b/src/NzbDrone.Core/Messaging/Commands/CommandExecutor.cs
@@ -129,7 +129,11 @@ namespace NzbDrone.Core.Messaging.Commands
                 }
 
                 handler.Execute((TCommand)command);
-                _trackCommands.Completed(command);
+
+                if (command.State == CommandStatus.Running)
+                {
+                    _trackCommands.Completed(command);
+                }
             }
             catch (Exception e)
             {