diff --git a/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.ts b/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.ts index ad030b0a..19169e7a 100644 --- a/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.ts +++ b/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.ts @@ -280,9 +280,12 @@ export default class ModalLoadProgram extends Vue { } close() { - this.cleanFileWatcher() - messageService.deleteChannel("esc_pressed"); - ModalHelper.HideModal(); + try { + this.cleanFileWatcher() + messageService.deleteChannel("esc_pressed"); + } catch{ } + // ModalHelper.HideModal(); + this.$router.back(); } reload() { @@ -299,6 +302,8 @@ export default class ModalLoadProgram extends Vue { await this.loadProgram(item.AbsolutePath); + this.$router.push({ name: 'setup' }) + this.askConfirmLayer = false } else { diff --git a/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.vue b/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.vue index 90e6fe45..37c9cdae 100644 --- a/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.vue +++ b/Thermo.Active/wwwroot/src/modules/base-components/modal-load-program.vue @@ -37,7 +37,7 @@ :disabled="!isCnReady()" @click="navigateTo('\\\\','\\\\', false, 1,0)" >--> -
+