diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-09-25 18:29:51 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-09-25 18:29:51 +0300 |
| commit | 051e3ca3f4039ec0d23408d9940b90bde1b4e857 (patch) | |
| tree | 2486df93b0bb7950aaf8f92fc145617ba58af049 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels | |
| parent | d990cf35a8816c7447fef4552ee83d041466636d (diff) | |
| parent | 18cb19e1a4f998bec498d509e755a1deb7ffd455 (diff) | |
| download | Tango-051e3ca3f4039ec0d23408d9940b90bde1b4e857.tar.gz Tango-051e3ca3f4039ec0d23408d9940b90bde1b4e857.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.cs | 3 |
1 files changed, 2 insertions, 1 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 31ba4e57d..b22d65192 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -454,6 +454,7 @@ namespace Tango.MachineStudio.UI.ViewModels x.SelectedMachine.EnableEmbeddedDebugging = x.EnableDiagnostics; x.SelectedMachine.EnableEventsNotification = x.EnableDiagnostics; x.SelectedMachine.UseKeepAlive = x.EnableKeepAlive; + x.SelectedMachine.JobUnitsMethod = _settings.JobUnitsMethod; if (x.SelectedMachine is ExternalBridgeTcpClient) { @@ -794,7 +795,7 @@ namespace Tango.MachineStudio.UI.ViewModels /// Displays the HTML. /// </summary> /// <param name="machineEvent">The HTML page.</param> - private async void ResolveMachineEvent(MachinesEvent machineEvent) + private void ResolveMachineEvent(MachinesEvent machineEvent) { } |