From 16dec3882ec9f78b5276ee5689530bfa8c3392a3 Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Fri, 12 Feb 2021 23:07:19 -0500
Subject: Fix old settings page not being used properly (#1376)

---
 ext/bg/js/backend.js      | 2 +-
 ext/bg/js/context-main.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'ext/bg')

diff --git a/ext/bg/js/backend.js b/ext/bg/js/backend.js
index 4a3b7663..1c4cb4d7 100644
--- a/ext/bg/js/backend.js
+++ b/ext/bg/js/backend.js
@@ -1805,7 +1805,7 @@ class Backend {
     async _openSettingsPage(mode) {
         const {useSettingsV2} = this._options.global;
         const manifest = chrome.runtime.getManifest();
-        const url = chrome.runtime.getURL(useSettingsV2 ? '/bg/settings2.html' : manifest.options_ui.page);
+        const url = chrome.runtime.getURL(useSettingsV2 ? manifest.options_ui.page : '/bg/settings.html');
         switch (mode) {
             case 'existingOrNewTab':
                 if (useSettingsV2) {
diff --git a/ext/bg/js/context-main.js b/ext/bg/js/context-main.js
index 65853514..6202878f 100644
--- a/ext/bg/js/context-main.js
+++ b/ext/bg/js/context-main.js
@@ -38,7 +38,7 @@ class DisplayController {
 
         this._setupHotkeys();
 
-        const optionsPageUrl = optionsFull.global.useSettingsV2 ? '/bg/settings2.html' : manifest.options_ui.page;
+        const optionsPageUrl = optionsFull.global.useSettingsV2 ? manifest.options_ui.page : '/bg/settings.html';
         this._setupButtonEvents('.action-open-settings', 'openSettingsPage', chrome.runtime.getURL(optionsPageUrl));
 
         const {profiles, profileCurrent} = optionsFull;
-- 
cgit v1.2.3