diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-03-01 17:47:27 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-03-01 17:47:27 +0200 |
| commit | 6c1f8f8df6b9ee71104098f548ba8be8504fc89b (patch) | |
| tree | fc0948888bb5dc156341f73d82306b26cc8523df /Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs | |
| parent | 046fce068413ae04454d07a0fd591bb200b30eef (diff) | |
| parent | 2c0f48e170634b93daa75abda4e246e85ffed519 (diff) | |
| download | Tango-6c1f8f8df6b9ee71104098f548ba8be8504fc89b.tar.gz Tango-6c1f8f8df6b9ee71104098f548ba8be8504fc89b.zip | |
merge conflicts
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.cs | 5 |
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; |