1 files changed, 17 insertions, 9 deletions

diff --git a/packages/main/src/reactions/synchronizeConfig.ts b/packages/main/src/reactions/synchronizeConfig.ts
index f3c8b4a..6044ee7 100644
--- a/packages/main/src/reactions/synchronizeConfig.ts
+++ b/packages/main/src/reactions/synchronizeConfig.ts
@@ -51,11 +51,16 @@ export default async function synchronizeConfig(
     const result = await repository.readConfig();
     if (result.found) {
       const { contents } = result;
+      if (contents === lastConfigOnDisk) {
+        // No need to re-apply config if we have already applied it.
+        return true;
+      }
       try {
         // This cast is unsound if the config file is invalid,
         // but we'll throw an error in the end anyways.
         const data = JSON.parse(contents) as Config;
         sharedStore.loadConfig(data);
+        log.info('Loaded config');
       } catch (error) {
         log.error('Failed to apply config snapshot', contents, error);
         return true;
@@ -75,16 +80,18 @@ export default async function synchronizeConfig(
     log.info('Created config file');
   }
 
+  const debouncedSerializeConfig = debounce(() => {
+    const serializedConfig = serializeConfig(sharedStore.config);
+    if (serializedConfig !== lastConfigOnDisk) {
+      writeConfig(serializedConfig).catch((error) => {
+        log.error('Failed to write config on config change', error);
+      });
+    }
+  }, debounceTime);
+
   const disposeReaction = reaction(
     () => sharedStore.config,
-    debounce(() => {
-      const serializedConfig = serializeConfig(sharedStore.config);
-      if (serializedConfig !== lastConfigOnDisk) {
-        writeConfig(serializedConfig).catch((error) => {
-          log.error('Failed to write config on config change', error);
-        });
-      }
-    }, debounceTime),
+    debouncedSerializeConfig,
   );
 
   const disposeWatcher = repository.watchConfig(async () => {
@@ -93,10 +100,11 @@ export default async function synchronizeConfig(
     } catch (error) {
       log.error('Failed to read config', error);
     }
-  }, debounceTime);
+  });
 
   return () => {
     disposeWatcher();
     disposeReaction();
+    debouncedSerializeConfig.flush();
   };
 }