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 781e034e8..c307a8e33 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/MachineStudioSettings.cs
@@ -130,6 +130,11 @@ namespace Tango.MachineStudio.Common
         public TimeSpan MaximumCacheTime { get; set; }
 
         /// <summary>
+        /// Gets or sets the external bridge request timeout.
+        /// </summary>
+        public TimeSpan ExternalBridgeRequestTimeout { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         public String MachineServiceAddress
@@ -167,6 +172,7 @@ namespace Tango.MachineStudio.Common
             CachingMode = ObservablesContextInMemoryCachingMode.None;
             Theme = MachineStudioTheme.Light;
             JobUnitsMethod = JobUnitsMethods.Operator;
+            ExternalBridgeRequestTimeout = TimeSpan.FromSeconds(5);
         }
     }
 }