diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-10 09:20:44 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-12-10 09:20:44 +0200 |
| commit | 3703a7ffb54849992d31d231e2375905b0003c7a (patch) | |
| tree | 70617c3932ee2593ea9f3f6fc6b543ae2ec8b245 /Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs | |
| parent | 397adba1c72901a4bb15e5d69b6a6c8e07488ea7 (diff) | |
| parent | 133fd74b460a6704a1b47720812d8b8ae4471f3f (diff) | |
| download | Tango-3703a7ffb54849992d31d231e2375905b0003c7a.tar.gz Tango-3703a7ffb54849992d31d231e2375905b0003c7a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs index 108752976..c201bf555 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs @@ -167,7 +167,7 @@ namespace Tango.PPC.UI.ViewModels { _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, Settings.MachineServiceAddress); LogManager.Log("Machine update completed."); - CompleteUpdate(); + await NavigateTo(MachineUpdateView.UpdateCompletedView); } catch (Exception ex) { @@ -178,14 +178,13 @@ namespace Tango.PPC.UI.ViewModels else { await NavigateTo(MachineUpdateView.UpdateDbProgressView); - LogManager.Log("Starting database update..."); try { await MachineUpdateManager.UpdateDB(_db_compare_result); LogManager.Log("Database update completed."); - await NavigateTo(MachineUpdateView.UpToDateView); + await NavigateTo(MachineUpdateView.UpdateCompletedView); } catch (Exception ex) { |