fix lint

src/main/utils/mergeDefaults.ts

@@ -13,7 +13,7 @@
 export function mergeDefaults<T>(obj: T, defaults: T): T {
     for (const key in defaults) {
         const v = defaults[key];
-        if (typeof v === "object" && !Array.isArray(v)) {
+        if (typeof v === "object" && !Array.isArray(v) && v !== null) {
             obj[key] ??= {} as any;
             mergeDefaults(obj[key], v);
         } else {

src/main/utils/popout.ts

@@ -37,7 +37,7 @@ const DEFAULT_POPOUT_OPTIONS: BrowserWindowConstructorOptions = {
     backgroundColor: "#2f3136",
     minWidth: MIN_POPOUT_WIDTH,
     minHeight: MIN_POPOUT_HEIGHT,
-    frame: Settings.store.customTitleBar !== true,
+    frame: Settings.store.nativeTitleBar,
     titleBarStyle: process.platform === "darwin" ? "hidden" : undefined,
     trafficLightPosition:
         process.platform === "darwin"