aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-02-25 11:35:18 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-02-25 11:35:18 +0200
commit5c8596be64deacfbe282c03ba21cec66ed4e2494 (patch)
treea8d3632748b8a56859936810e170883f92e4fbc0 /Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
parentc3b9b401883c2ef45accfa2d26c7ff6276691c34 (diff)
parentfdb539e472eaaaff74a05aa661e471543ae07313 (diff)
downloadTango-5c8596be64deacfbe282c03ba21cec66ed4e2494.tar.gz
Tango-5c8596be64deacfbe282c03ba21cec66ed4e2494.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
index aca9dbcf7..ae31a64a1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -347,7 +347,10 @@ namespace Tango.PPC.UI.ViewModels
try
{
- _ppcWebClient.Environment = DeploymentSlot;
+ if (!App.StartupArgs.Contains("-webDebug"))
+ {
+ _ppcWebClient.Environment = DeploymentSlot;
+ }
await _operationSystemManager.ChangeTimeZone(SelectedTimeZone);
_setup_result = await MachineSetupManager.Setup(SerialNumber);
State = MachineSetupStates.Completed;