diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-09-23 13:34:30 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-09-23 13:34:30 +0300 |
| commit | 4d4faf06889e83a232195cf1a2b80548b3c4019e (patch) | |
| tree | 6f64078d09a631d6da04cd93a60a8a1773681024 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | |
| parent | ced65bd856f1a5d5b55910cb8f5993562b8ea89b (diff) | |
| parent | 15e5bbbdd09e6629235f9d8739e61209f937723c (diff) | |
| download | Tango-4d4faf06889e83a232195cf1a2b80548b3c4019e.tar.gz Tango-4d4faf06889e83a232195cf1a2b80548b3c4019e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
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.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) { } |