From 322b2ea9f3c96acecb9c3c0b91308309bd0bc559 Mon Sep 17 00:00:00 2001
From: Miodec <bartnikjack@gmail.com>
Date: Tue, 17 Aug 2021 18:14:53 +0100
Subject: [PATCH] merge fixes

---
 src/js/popups/edit-preset-popup.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/js/popups/edit-preset-popup.js b/src/js/popups/edit-preset-popup.js
index db280dd88..175c22b35 100644
--- a/src/js/popups/edit-preset-popup.js
+++ b/src/js/popups/edit-preset-popup.js
@@ -118,7 +118,7 @@ async function apply() {
       response = await axiosInstance.post("/presets/edit", {
         name: inputVal,
         _id: presetid,
-        config: override === true ? configChanges : null,
+        config: updateConfig === true ? configChanges : null,
       });
     } catch (e) {
       Loader.hide();
@@ -135,7 +135,7 @@ async function apply() {
         (preset) => preset._id == presetid
       )[0];
       preset.name = inputVal;
-      if (override === true) preset.config = configChanges;
+      if (updateConfig === true) preset.config = configChanges;
       Settings.update();
     }
   } else if (action === "remove") {