From cbc80e71fac7d2896ac496b0fbf22051c0cdcff7 Mon Sep 17 00:00:00 2001
From: Avi Levkovich <avi@twine-s.com>
Date: Mon, 17 Feb 2020 17:00:29 +0200
Subject: merge

---
 .../ViewModels/EnvironmentFirmwareUpgradeViewVM.cs         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentFirmwareUpgradeViewVM.cs')

diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentFirmwareUpgradeViewVM.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentFirmwareUpgradeViewVM.cs
index 54576cda7..964febbd8 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentFirmwareUpgradeViewVM.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentFirmwareUpgradeViewVM.cs
@@ -94,10 +94,6 @@ namespace Tango.AzureUtils.UI.ViewModels
                 IsFree = false;
 
                 await _firmwareManager.InjectFirmwarePackage(SelectedDeploymentSlot, FilePath);
-
-                var old = SelectedDeploymentSlot;
-                SelectedDeploymentSlot = null;
-                SelectedDeploymentSlot = old;
             }
             catch (Exception ex)
             {
@@ -105,8 +101,18 @@ namespace Tango.AzureUtils.UI.ViewModels
             }
             finally
             {
+                RequireRefresh();
                 IsFree = true;
             }
         }
+
+        protected override void OnRefreshRequired()
+        {
+            base.OnRefreshRequired();
+
+            var old = SelectedDeploymentSlot;
+            SelectedDeploymentSlot = null;
+            SelectedDeploymentSlot = old;
+        }
     }
 }
-- 
cgit v1.3.1