aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-01-27 12:12:50 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-01-27 12:12:50 +0200
commit59749d5b842452644320de73ba770996c2aa3d9e (patch)
tree3b64790555fcc31da40da132e96f8bd8b3b92bd7 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels
parent685d220c4120f8be1315995c3c4ba3b9d9ee74d0 (diff)
parentbf2f3245339b9fd9148a2ad25b5ba3320e970cc1 (diff)
downloadTango-59749d5b842452644320de73ba770996c2aa3d9e.tar.gz
Tango-59749d5b842452644320de73ba770996c2aa3d9e.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs5
1 files changed, 5 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 23765de35..2a00386dc 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -473,6 +473,11 @@ namespace Tango.MachineStudio.UI.ViewModels
x.SelectedMachine.ContinuousRequestTimeout = _settings.ExternalBridgeContinuousRequestTimeout;
}
+ if (x.SelectedMachine.Adapter is TcpTransportAdapter)
+ {
+ (x.SelectedMachine.Adapter as TcpTransportAdapter).WriteMode = _settings.TcpTransportAdapterWriteMode;
+ }
+
if (x.SelectedMachine.RequiresAuthentication)
{
ConnectToMachineSecure(x.SelectedMachine as IExternalBridgeSecureClient);