merge

1 files changed, 13 insertions, 7 deletions

diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentUpgradeViewVM.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentUpgradeViewVM.cs
index 14e4bf196..3f353d54d 100644
--- a/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentUpgradeViewVM.cs
+++ b/Software/Visual_Studio/Azure/Tango.AzureUtils.UI/ViewModels/EnvironmentUpgradeViewVM.cs
@@ -112,13 +112,6 @@ namespace Tango.AzureUtils.UI.ViewModels
             {
                 IsFree = false;
                 await EnvironmentManager.UpgradeEnvironment(SelectedSourceApp, SelectedTargetApp, Config);
-
-                var oldSource = SelectedSourceApp;
-                var oldTarget = SelectedTargetApp;
-                SelectedSourceApp = null;
-                SelectedTargetApp = null;
-                SelectedSourceApp = oldSource;
-                SelectedTargetApp = oldTarget;
             }
             catch (Exception ex)
             {
@@ -126,8 +119,21 @@ namespace Tango.AzureUtils.UI.ViewModels
             }
             finally
             {
+                RequireRefresh();
                 IsFree = true;
             }
         }
+
+        protected override void OnRefreshRequired()
+        {
+            base.OnRefreshRequired();
+
+            var oldSource = SelectedSourceApp;
+            var oldTarget = SelectedTargetApp;
+            SelectedSourceApp = null;
+            SelectedTargetApp = null;
+            SelectedSourceApp = oldSource;
+            SelectedTargetApp = oldTarget;
+        }
     }
 }