From 7b249a82d787275208f363f9ef7b182a1df1ade3 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Thu, 4 Jul 2019 12:04:24 +0200 Subject: [PATCH] fixed crash when no window position is saved (fixes #1175) --- app/lib/window.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/lib/window.ts b/app/lib/window.ts index d3fdb179..8966e931 100644 --- a/app/lib/window.ts +++ b/app/lib/window.ts @@ -51,16 +51,18 @@ export class Window { show: false, backgroundColor: '#00000000' } - Object.assign(bwOptions, this.windowBounds) - const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} ) + if (this.windowBounds) { + Object.assign(bwOptions, this.windowBounds) + const closestDisplay = screen.getDisplayNearestPoint( {x: this.windowBounds.x, y: this.windowBounds.y} ) - const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]; - const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]; + const [left1, top1, right1, bottom1] = [this.windowBounds.x, this.windowBounds.y, this.windowBounds.x + this.windowBounds.width, this.windowBounds.y + this.windowBounds.height]; + const [left2, top2, right2, bottom2] = [closestDisplay.bounds.x, closestDisplay.bounds.y, closestDisplay.bounds.x + closestDisplay.bounds.width, closestDisplay.bounds.y + closestDisplay.bounds.height]; - if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) { - bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2; - bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2; + if ((left2 > right1 || right2 < left1 || top2 > bottom1 || bottom2 < top1) && !maximized) { + bwOptions.x = closestDisplay.bounds.width / 2 - bwOptions.width / 2; + bwOptions.y = closestDisplay.bounds.height / 2 - bwOptions.height / 2; + } } if ((configData.appearance || {}).frame === 'native') {