Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 16 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index c201bf555..a553f3a18 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -61,6 +61,16 @@ namespace Tango.PPC.UI.ViewModels
             set { _isDbUpdate = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _failedError;
+        /// <summary>
+        /// Gets or sets the setup failed error.
+        /// </summary>
+        public String FailedError
+        {
+            get { return _failedError; }
+            set { _failedError = value; RaisePropertyChangedAuto(); }
+        }
+
         #endregion
 
         #region Commands
@@ -126,7 +136,7 @@ namespace Tango.PPC.UI.ViewModels
             {
                 IsDbUpdate = false;
 
-                var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber, Settings.MachineServiceAddress);
+                var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
 
                 if (response.IsUpdateAvailable)
                 {
@@ -135,7 +145,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 else
                 {
-                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber, Settings.MachineServiceAddress);
+                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
 
                     if (_db_compare_result.RequiresUpdate)
                     {
@@ -150,6 +160,7 @@ namespace Tango.PPC.UI.ViewModels
             }
             catch (Exception ex)
             {
+                FailedError = ex.FlattenMessage();
                 LogManager.Log(ex, "Error while trying to check for updates.");
                 await NavigateTo(MachineUpdateView.UpdateFailedView);
             }
@@ -165,12 +176,13 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, Settings.MachineServiceAddress);
+                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, Settings.GetMachineServiceAddress());
                     LogManager.Log("Machine update completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }
                 catch (Exception ex)
                 {
+                    FailedError = ex.FlattenMessage();
                     LogManager.Log(ex, "Machine update failed.");
                     await NavigateTo(MachineUpdateView.UpdateFailedView);
                 }
@@ -188,6 +200,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 catch (Exception ex)
                 {
+                    FailedError = ex.FlattenMessage();
                     LogManager.Log(ex, "Database update failed.");
                     await NavigateTo(MachineUpdateView.UpdateFailedView);
                 }