Fix beforeDestroy and caller of isOverrideAllowed

PrestaShop · Nov 13, 2024 · 2120d06 · 2120d06
1 parent 2840980
commit 2120d06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/_dev/src/ts/pages/UpdatePageUpdateOptions.ts b/_dev/src/ts/pages/UpdatePageUpdateOptions.ts
@@ -11,8 +11,12 @@ export default class UpdatePageUpdateOptions extends UpdatePage {
   }
 
   public beforeDestroy() {
-    this.form.removeEventListener('submit', this.onSubmit);
-    this.form.removeEventListener('change', this.onChange);
+    try {
+      this.form.removeEventListener('submit', this.onSubmit);
+      this.form.removeEventListener('change', this.onChange);
+    } catch (e) {
+      // Do Nothing, page is likely removed from the DOM already
+    }
   }
 
   private get form(): HTMLFormElement {

diff --git a/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php b/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php
@@ -136,10 +136,10 @@ public function finalizeCoreUpdate(): void
         $this->cleanXmlFiles();
 
         if (UpgradeConfiguration::isOverrideAllowed()) {
+            $this->logger->info($this->container->getTranslator()->trans('Keeping overrides in place'));
+        } else {
             $this->logger->info($this->container->getTranslator()->trans('Disabling overrides'));
             $this->disableOverrides();
-        } else {
-            $this->logger->info($this->container->getTranslator()->trans('Keeping overrides in place'));
         }
 
         $this->updateTheme();