merge alarm handling from remote

1 files changed, 16 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 b5b5f56bc..f265c5dbf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -33,6 +33,7 @@ namespace Tango.PPC.UI.ViewModels
 
         private MachineUpdateResult _update_result;
         private DbCompareResult _db_compare_result;
+        private bool _isChecking;
 
         #region Properties
 
@@ -132,10 +133,21 @@ namespace Tango.PPC.UI.ViewModels
         {
             await NavigateTo(MachineUpdateView.UpdateCheckView);
 
+            if (_isChecking) return;
+
             try
             {
+                _isChecking = true;
                 IsDbUpdate = false;
 
+                await Task.Delay(2000);
+                if (!await ConnectivityProvider.CheckInternetConnection())
+                {
+                    _isChecking = false;
+                    await NavigateTo(MachineUpdateView.UpdateCheckErrorView);
+                    return;
+                }
+
                 var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber);
 
                 if (response.IsUpdateAvailable)
@@ -164,6 +176,10 @@ namespace Tango.PPC.UI.ViewModels
                 LogManager.Log(ex, "Error while trying to check for updates.");
                 await NavigateTo(MachineUpdateView.UpdateFailedView);
             }
+            finally
+            {
+                _isChecking = false;
+            }
         }
 
         private async void Update()