3 files changed, 30 insertions, 19 deletions

diff --git a/ext/js/pages/settings/profile-controller.js b/ext/js/pages/settings/profile-controller.js
index e31bc07e..018c9ec1 100644
--- a/ext/js/pages/settings/profile-controller.js
+++ b/ext/js/pages/settings/profile-controller.js
@@ -215,13 +215,13 @@ class ProfileController {
 
         this._updateProfileSelectOptions();
 
-        // Modify settings
-        await this._settingsController.modifyGlobalSettings(modifications);
-
         // Update profile index
         if (settingsProfileIndex === profileIndex) {
             this._settingsController.profileIndex = profileCurrentNew;
         }
+
+        // Modify settings
+        await this._settingsController.modifyGlobalSettings(modifications);
     }
 
     async swapProfiles(index1, index2) {
diff --git a/ext/js/pages/settings/settings-controller.js b/ext/js/pages/settings/settings-controller.js
index b0180827..111b98e4 100644
--- a/ext/js/pages/settings/settings-controller.js
+++ b/ext/js/pages/settings/settings-controller.js
@@ -22,9 +22,9 @@
  */
 
 class SettingsController extends EventDispatcher {
-    constructor(profileIndex=0) {
+    constructor() {
         super();
-        this._profileIndex = profileIndex;
+        this._profileIndex = 0;
         this._source = generateId(16);
         this._pageExitPreventions = new Set();
         this._pageExitPreventionEventListeners = new EventListenerCollection();
@@ -42,23 +42,28 @@ class SettingsController extends EventDispatcher {
 
     set profileIndex(value) {
         if (this._profileIndex === value) { return; }
-        this._setProfileIndex(value);
+        this._setProfileIndex(value, true);
     }
 
     get permissionsUtil() {
         return this._permissionsUtil;
     }
 
-    prepare() {
+    async prepare() {
         yomichan.on('optionsUpdated', this._onOptionsUpdated.bind(this));
         if (this._canObservePermissionsChanges()) {
             chrome.permissions.onAdded.addListener(this._onPermissionsChanged.bind(this));
             chrome.permissions.onRemoved.addListener(this._onPermissionsChanged.bind(this));
         }
+        const optionsFull = await this.getOptionsFull();
+        const {profiles, profileCurrent} = optionsFull;
+        if (profileCurrent >= 0 && profileCurrent < profiles.length) {
+            this._profileIndex = profileCurrent;
+        }
     }
 
     async refresh() {
-        await this._onOptionsUpdatedInternal();
+        await this._onOptionsUpdatedInternal(true);
     }
 
     async getOptions() {
@@ -73,7 +78,7 @@ class SettingsController extends EventDispatcher {
     async setAllSettings(value) {
         const profileIndex = value.profileCurrent;
         await yomichan.api.setAllSettings(value, this._source);
-        this._setProfileIndex(profileIndex);
+        this._setProfileIndex(profileIndex, true);
     }
 
     async getSettings(targets) {
@@ -143,21 +148,29 @@ class SettingsController extends EventDispatcher {
 
     // Private
 
-    _setProfileIndex(value) {
+    _setProfileIndex(value, canUpdateProfileIndex) {
         this._profileIndex = value;
         this.trigger('optionsContextChanged');
-        this._onOptionsUpdatedInternal();
+        this._onOptionsUpdatedInternal(canUpdateProfileIndex);
     }
 
     _onOptionsUpdated({source}) {
         if (source === this._source) { return; }
-        this._onOptionsUpdatedInternal();
+        this._onOptionsUpdatedInternal(true);
     }
 
-    async _onOptionsUpdatedInternal() {
+    async _onOptionsUpdatedInternal(canUpdateProfileIndex) {
         const optionsContext = this.getOptionsContext();
-        const options = await this.getOptions();
-        this.trigger('optionsChanged', {options, optionsContext});
+        try {
+            const options = await this.getOptions();
+            this.trigger('optionsChanged', {options, optionsContext});
+        } catch (e) {
+            if (canUpdateProfileIndex) {
+                this._setProfileIndex(0, false);
+                return;
+            }
+            throw e;
+        }
     }
 
     _setupTargets(targets, extraFields) {
diff --git a/ext/js/pages/settings/settings-main.js b/ext/js/pages/settings/settings-main.js
index a3dcf357..aa94ef46 100644
--- a/ext/js/pages/settings/settings-main.js
+++ b/ext/js/pages/settings/settings-main.js
@@ -77,15 +77,13 @@ async function setupGenericSettingsController(genericSettingController) {
         }
         delete document.documentElement.dataset.loadingStalled;
 
-        const optionsFull = await yomichan.api.optionsGetFull();
-
         const preparePromises = [];
 
         const modalController = new ModalController();
         modalController.prepare();
 
-        const settingsController = new SettingsController(optionsFull.profileCurrent);
-        settingsController.prepare();
+        const settingsController = new SettingsController();
+        await settingsController.prepare();
 
         const persistentStorageController = new PersistentStorageController();
         persistentStorageController.prepare();