From d33c19b3ac6803de4b5c8d475832efef131c1a45 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy@twine-s.com>
Date: Wed, 30 Dec 2020 15:11:34 +0000
Subject: Revert "Hope it is fine"

---
 .../Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs      | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
index e45c29f73..7d2d8b401 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs
@@ -202,11 +202,17 @@ namespace Tango.MachineStudio.UI.ViewModels
             {
                 IsFree = true;
                 CanClose = true;
+                _stream?.Dispose();
                 UpgradeError = ex.FlattenMessage();
                 CurrentPage = 3;
             }
         }
 
+        protected override bool CanOK()
+        {
+            return base.CanOK() && CanClose;
+        }
+
         private async void AbortUpgrade()
         {
             CanClose = true;
-- 
cgit v1.3.1