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

1 files changed, 13 insertions, 0 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..79974bff4 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
@@ -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);
             }
@@ -171,6 +182,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 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);
                 }