aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-07-17 09:21:38 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-07-17 09:21:38 +0300
commit2d5eb6eee8013b5089a43256bdf9bbe540431958 (patch)
treed9829ae5e63e1e16436a316da9280b95e552a88d /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI
parent1c8ed5078d97519d22db9a3c3ab4d9e1d70bdf1b (diff)
parentc5a54597a0a02da5b3cf942fff95586a9dfe836d (diff)
downloadTango-2d5eb6eee8013b5089a43256bdf9bbe540431958.tar.gz
Tango-2d5eb6eee8013b5089a43256bdf9bbe540431958.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt2
-rw-r--r--Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs8
2 files changed, 5 insertions, 5 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
index d9710b5fc..4e5321cc7 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt
@@ -1 +1 @@
-Sun 07/15/2018 18:18:51.73
+Mon 07/16/2018 19:59:53.31
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 fd28d5b1e..a7762a5e6 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -444,9 +444,9 @@ namespace Tango.MachineStudio.UI.ViewModels
{
try
{
- if (!x.SelectedMachine.EnableDiagnostics)
+ if (x.SelectedMachine.EnableDiagnostics)
{
- x.SelectedMachine.EnableEmbeddedDebugging = false;
+ x.SelectedMachine.EnableEmbeddedDebugging = true;
}
await x.SelectedMachine.Connect();
@@ -484,9 +484,9 @@ namespace Tango.MachineStudio.UI.ViewModels
{
try
{
- if (!x.SelectedMachine.EnableDiagnostics)
+ if (x.SelectedMachine.EnableDiagnostics)
{
- x.SelectedMachine.EnableEmbeddedDebugging = false;
+ x.SelectedMachine.EnableEmbeddedDebugging = true;
}
await x.SelectedMachine.Connect();