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

1 files changed, 6 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
index c307a8e33..1831d5aa3 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -135,6 +135,11 @@ namespace Tango.MachineStudio.Common
         public TimeSpan ExternalBridgeRequestTimeout { get; set; }
 
         /// <summary>
+        /// Gets or sets the external bridge continuous request timeout.
+        /// </summary>
+        public TimeSpan ExternalBridgeContinuousRequestTimeout { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         public String MachineServiceAddress
@@ -173,6 +178,7 @@ namespace Tango.MachineStudio.Common
             Theme = MachineStudioTheme.Light;
             JobUnitsMethod = JobUnitsMethods.Operator;
             ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
+            ExternalBridgeContinuousRequestTimeout = TimeSpan.FromSeconds(5);
         }
     }
 }