Remove unnecessary IPC roundtrip from desktop settings initialization

GarboMuffin · GarboMuffin · commit 4cc4ecfb3dbf · 2025-10-10T21:55:38.000-05:00
diff --git a/src-main/windows/desktop-settings.js b/src-main/windows/desktop-settings.js
@@ -14,26 +14,23 @@ class DesktopSettingsWindow extends AbstractWindow {
     this.window.setMinimizable(false);
     this.window.setMaximizable(false);
 
-    this.ipc.on('get-strings', (event) => {
+    this.ipc.on('init', (event) => {
       event.returnValue = {
         locale: getLocale(),
-        strings: getStrings()
-      }
-    });
-
-    this.ipc.on('get-settings', (event) => {
-      event.returnValue = {
-        updateCheckerAllowed: isUpdateCheckerAllowed(),
-        updateChecker: settings.updateChecker,
-        microphone: settings.microphone,
-        camera: settings.camera,
-        hardwareAcceleration: settings.hardwareAcceleration,
-        backgroundThrottling: settings.backgroundThrottling,
-        bypassCORS: settings.bypassCORS,
-        spellchecker: settings.spellchecker,
-        exitFullscreenOnEscape: settings.exitFullscreenOnEscape,
-        richPresenceAvailable: RichPresence.isAvailable(),
-        richPresence: settings.richPresence
+        strings: getStrings(),
+        settings: {
+          updateCheckerAllowed: isUpdateCheckerAllowed(),
+          updateChecker: settings.updateChecker,
+          microphone: settings.microphone,
+          camera: settings.camera,
+          hardwareAcceleration: settings.hardwareAcceleration,
+          backgroundThrottling: settings.backgroundThrottling,
+          bypassCORS: settings.bypassCORS,
+          spellchecker: settings.spellchecker,
+          exitFullscreenOnEscape: settings.exitFullscreenOnEscape,
+          richPresenceAvailable: RichPresence.isAvailable(),
+          richPresence: settings.richPresence
+        }
       };
     });
 
diff --git a/src-preload/desktop-settings.js b/src-preload/desktop-settings.js
@@ -1,8 +1,7 @@
 const {contextBridge, ipcRenderer} = require('electron');
 
 contextBridge.exposeInMainWorld('DesktopSettingsPreload', {
-  getStrings: () => ipcRenderer.sendSync('get-strings'),
-  getSettings: () => ipcRenderer.sendSync('get-settings'),
+  init: () => ipcRenderer.sendSync('init'),
   setUpdateChecker: (updateChecker) => ipcRenderer.invoke('set-update-checker', updateChecker),
   enumerateMediaDevices: () => ipcRenderer.invoke('enumerate-media-devices'),
   setMicrophone: (microphone) => ipcRenderer.invoke('set-microphone', microphone),
diff --git a/src-renderer/desktop-settings/desktop-settings.html b/src-renderer/desktop-settings/desktop-settings.html
@@ -55,10 +55,8 @@
   <body>
     <main>
       <script>
-        const {locale, strings} = DesktopSettingsPreload.getStrings();
+        const {locale, strings, settings} = DesktopSettingsPreload.init();
         document.documentElement.lang = locale;
-
-        const settings = DesktopSettingsPreload.getSettings();
       </script>
 
       <h1 class="title"></h1>
