1 files changed, 11 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 0ea47c24a..5e44bf43d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -53,7 +53,18 @@ 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;