merge

1 files changed, 0 insertions, 14 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 5e44bf43d..d1f3cc69e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -4,7 +4,6 @@ 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;
@@ -53,18 +52,7 @@ namespace Tango.MachineStudio.UI.ViewModels
         {
             if (_scanner == null)
             {
-                var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
                 _scanner = new ExternalBridgeScanner();
-                _scanner.SignalRConfiguration.Enabled = settings.EnableExternalBridgeSignalR;
-                if (App.StartupArgs.Contains("-webDebug"))
-                {
-                    _scanner.SignalRConfiguration.Address = "http://localhost:1111/"; //settings.DeploymentSlot.ToAddress();
-                }
-                else
-                {
-                    _scanner.SignalRConfiguration.Address = settings.DeploymentSlot.ToAddress();
-                }
-                _scanner.SignalRConfiguration.Hub = settings.ExternalBridgeSignalRHub;
             }
 
             EnableDiagnostics = true;
@@ -120,8 +108,6 @@ 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()}");
             }
         }