diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-07-24 18:11:19 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-07-24 18:11:19 +0300 |
| commit | 0e448553af26885f648b41fed4001bcbdab9fbee (patch) | |
| tree | b6c2b0ee89cc334f3d04e829f0ec551743e4cc88 /Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup | |
| parent | 33cebf98be02ede27ee22ca98ee21f3525bfd8b9 (diff) | |
| parent | fd81643e32328a0d548c7cebdba008050ae03673 (diff) | |
| download | Tango-0e448553af26885f648b41fed4001bcbdab9fbee.tar.gz Tango-0e448553af26885f648b41fed4001bcbdab9fbee.zip | |
merge conflict
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs index 05cf15a38..94091b284 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs @@ -164,25 +164,28 @@ namespace Tango.PPC.Common.MachineSetup }); } - if (setup_response.SetupActivation) + if (settings.ApplicationState == ApplicationStates.PreSetup) { - LogManager.Log("Activating windows license..."); - UpdateProgress("Activating operation system license", "Activating..."); - await _windows_manager.Activate(setup_response.OSKey); - } + if (setup_response.SetupActivation) + { + LogManager.Log("Activating windows license..."); + UpdateProgress("Activating operation system license", "Activating..."); + await _windows_manager.Activate(setup_response.OSKey); + } - if (setup_response.SetupRemoteAssistance) - { - LogManager.Log("Installing remote assistance..."); - UpdateProgress("Installing remote assistance", "Installing..."); - await _remoteAssistance.InstallRemoteAssistance(serialNumber); - } + if (setup_response.SetupRemoteAssistance) + { + LogManager.Log("Installing remote assistance..."); + UpdateProgress("Installing remote assistance", "Installing..."); + await _remoteAssistance.InstallRemoteAssistance(serialNumber); + } - if (setup_response.SetupUWF) - { - LogManager.Log("Activating unified write filter..."); - UpdateProgress("Activating disk protection", "Activating..."); - await _uwf.Setup(); + if (setup_response.SetupUWF) + { + LogManager.Log("Activating unified write filter..."); + UpdateProgress("Activating disk protection", "Activating..."); + await _uwf.Setup(); + } } //Create temporary folders for packages. |