1 files changed, 10 insertions, 7 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs
index ec35a9581..57cd3aa43 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Upgrade/ViewModels/FirmwareUpgradeGeneratedViewVM.cs
@@ -219,14 +219,17 @@ namespace Tango.FSE.Upgrade.ViewModels
             {
                 var abort = await NotificationProvider.ShowWarningQuestion("Are you sure you want to abort the upgrade operation?");
 
-                if (Handler.CanAbort)
+                if (Handler.Status == RemoteUpgradeHandlerStatus.Started)
                 {
-                    Handler.Abort();
-                }
-                else
-                {
-                    await NotificationProvider.ShowWarning("Cannot abort the operation at this stage.");
-                    return false;
+                    if (Handler.CanAbort)
+                    {
+                        Handler.Abort();
+                    }
+                    else
+                    {
+                        await NotificationProvider.ShowWarning("Cannot abort the operation at this stage.");
+                        return false;
+                    }
                 }
 
                 return abort;