From cf8d5b214668866ff20b94521e74792483899e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Thu, 10 Oct 2024 14:48:44 +0200
Subject: [PATCH] Protecting against null API's and undefined data

---
 .../src/platform/popup-modal-styles.ts        | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/src/platform/popup-modal-styles.ts b/apps/desktop/src/platform/popup-modal-styles.ts
index 629e7c84f4f..ec1c58d11fe 100644
--- a/apps/desktop/src/platform/popup-modal-styles.ts
+++ b/apps/desktop/src/platform/popup-modal-styles.ts
@@ -9,8 +9,8 @@ export function applyPopupModalStyles(window: BrowserWindow) {
   window.unmaximize();
   window.setSize(popupWidth, popupHeight);
   window.center();
-  window.setWindowButtonVisibility(false);
-  window.setMenuBarVisibility(false);
+  window.setWindowButtonVisibility?.(false);
+  window.setMenuBarVisibility?.(false);
   window.setResizable(false);
   window.setAlwaysOnTop(true);
 
@@ -26,10 +26,19 @@ export function applyPopupModalStyles(window: BrowserWindow) {
 
 export function applyMainWindowStyles(window: BrowserWindow, existingWindowState: WindowState) {
   window.setMinimumSize(400, 400);
-  window.setSize(existingWindowState.width, existingWindowState.height);
-  window.setPosition(existingWindowState.x, existingWindowState.y);
-  window.setWindowButtonVisibility(true);
-  window.setMenuBarVisibility(true);
+
+  // need to guard against null/undefined values
+  if (existingWindowState) {
+    if (existingWindowState.width && existingWindowState.height) {
+      window.setSize(existingWindowState.width, existingWindowState.height);
+    }
+
+    if (existingWindowState.x && existingWindowState.y) {
+      window.setPosition(existingWindowState.x, existingWindowState.y);
+    }
+  }
+  window.setWindowButtonVisibility?.(true);
+  window.setMenuBarVisibility?.(true);
   window.setResizable(true);
   window.setAlwaysOnTop(false);