aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-10-27 13:19:32 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-10-27 13:19:32 +0200
commit88f609c6244121f07b45e8101174fdc293bbcb2d (patch)
tree330aaad66b1a34ccfb2a29cacfe3fc8c4f01500b /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
parent312e8ccad554d6d0e7d21444e069731e770db978 (diff)
downloadTango-88f609c6244121f07b45e8101174fdc293bbcb2d.tar.gz
Tango-88f609c6244121f07b45e8101174fdc293bbcb2d.zip
Removed rollback version in machine studio.
Omitted remove old dll files from machine studio updater. Removed ColorCapture module from MS update to reduce package size. Added ColorCapture module only to MS installer. Added ExternalBridge default timeout to machine studio settings file.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index b22d65192..90fe25c8f 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -459,6 +459,7 @@ namespace Tango.MachineStudio.UI.ViewModels
if (x.SelectedMachine is ExternalBridgeTcpClient)
{
x.SelectedMachine.As<ExternalBridgeTcpClient>().EnableApplicationLogs = x.EnableApplicationLogs;
+ x.SelectedMachine.RequestTimeout = _settings.ExternalBridgeRequestTimeout;
}
if (x.SelectedMachine.RequiresAuthentication)