From c5cde62cecfdd413e9902b26b30b0d4dfd05a24d Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Thu, 14 Mar 2019 13:25:32 +0200
Subject: Machine Studio v4.0.10 PPC v1.0.9

---
 .../PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs     | 13 ++++++++-----
 .../PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs      |  8 ++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
index 83f629159..80a95d1bf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/ExternalBridgeViewVM.cs
@@ -116,12 +116,15 @@ namespace Tango.PPC.UI.ViewModels
         /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param>
         private void ExternalBridgeService_ClientDisconnected(object sender, EventArgs e)
         {
-            LogManager.Log("External bridge client disconnected. Navigating to home module...");
-
-            InvokeUI(() =>
+            if (IsVisible)
             {
-                NavigationManager.NavigateTo(NavigationView.HomeModule);
-            });
+                LogManager.Log("External bridge client disconnected. Navigating to home module...");
+
+                InvokeUI(() =>
+                {
+                    NavigationManager.NavigateTo(NavigationView.HomeModule);
+                });
+            }
         }
 
         /// <summary>
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 07da99818..f265c5dbf 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -140,6 +140,14 @@ namespace Tango.PPC.UI.ViewModels
                 _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)
-- 
cgit v1.3.1