Fix settings being partially saved while loading

client/src/modules/settings.js

@@ -30,8 +30,8 @@ export default new class Settings {
                 Events.emit(`setting-updated-${set.id}_${category.id}_${setting.id}`, event);
             });
 
-            set.on('settings-updated', async (event) => {
-                await this.saveSettings();
+            set.on('settings-updated', async event => {
+                if (!event.data || !event.data.dont_save) await this.saveSettings();
                 Events.emit('settings-updated', event);
             });
 
@@ -43,6 +43,8 @@ export default new class Settings {
      * Loads BetterDiscord's settings.
      */
     async loadSettings() {
+        Logger.log('Settings', ['Loading settings']);
+
         try {
             await FileUtils.ensureDirectory(this.dataPath);
 
@@ -53,7 +55,7 @@ export default new class Settings {
             for (let set of this.settings) {
                 const newSet = settings.find(s => s.id === set.id);
                 if (!newSet) continue;
-                await set.merge(newSet);
+                await set.merge(newSet, {dont_save: true});
                 set.setSaved();
             }
 
@@ -71,6 +73,8 @@ export default new class Settings {
      * Saves BetterDiscord's settings including CSS editor data.
      */
     async saveSettings() {
+        Logger.log('Settings', ['Saving settings']);
+
         try {
             await FileUtils.ensureDirectory(this.dataPath);
 

client/src/structs/events/event.js

@@ -24,6 +24,13 @@ export default class Event {
         return this.__eventInfo;
     }
 
+    /**
+     * Extra data associated with this event.
+     */
+    get data() {
+        return this.args.data;
+    }
+
     /**
      * The first argument that was passed to the constructor, which contains information about the event.
      */

client/src/structs/settings/settingsset.js

@@ -412,7 +412,8 @@ export default class SettingsSet extends AsyncEventEmitter {
 
         if (emit_multi)
             await this.emit('settings-updated', new SettingsUpdatedEvent({
-                updatedSettings
+                updatedSettings,
+                data: typeof emit_multi !== 'boolean' ? emit_multi : undefined
             }));
 
         return updatedSettings;