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

1 files changed, 3 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index d1f3cc69e..0ea47c24a 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Tango.Core.Commands;
+using Tango.Core.DI;
 using Tango.Emulations.ExternalBridge;
 using Tango.Integration.ExternalBridge;
 using Tango.MachineStudio.Common;
@@ -108,6 +109,8 @@ namespace Tango.MachineStudio.UI.ViewModels
             catch (Exception ex)
             {
                 LogManager.Log(ex, "Error starting external bridge scanner.");
+                Cancel();
+                TangoIOC.Default.GetInstance<INotificationProvider>().ShowError($"There is a problem with machine scanning.\n{ex.FlattenMessage()}");
             }
         }