From 90bbfc526e78f1c860d6fca5bcca3de2fc088b4c Mon Sep 17 00:00:00 2001
From: Vishwas Shashidhar <VishwasShashidhar@users.noreply.github.com>
Date: Thu, 30 Apr 2020 19:57:26 +0530
Subject: [PATCH] SDA-2013: fix origin check for simplified installer (#981)

Signed-off-by: Vishwas Shashidhar <vishwas.shashidhar@symphony.com>
---
 src/app/child-window-handler.ts | 2 +-
 src/app/window-handler.ts       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/child-window-handler.ts b/src/app/child-window-handler.ts
index 2221bb06..2061c032 100644
--- a/src/app/child-window-handler.ts
+++ b/src/app/child-window-handler.ts
@@ -159,7 +159,7 @@ export const handleChildWindow = (webContents: WebContents): void => {
             // Event needed to hide native menu bar
             childWebContents.once('did-start-loading', () => {
                 const browserWin = BrowserWindow.fromWebContents(childWebContents) as ICustomBrowserWindow;
-                browserWin.origin = config.getGlobalConfigFields([ 'url' ]).url;
+                browserWin.origin = windowHandler.url;
                 if (isWindowsOS && browserWin && !browserWin.isDestroyed()) {
                     browserWin.setMenuBarVisibility(false);
                 }
diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
index 78422fb4..9a6b56f4 100644
--- a/src/app/window-handler.ts
+++ b/src/app/window-handler.ts
@@ -254,7 +254,7 @@ export class WindowHandler {
         // check for build expiry in case of test builds
         this.checkExpiry(this.mainWindow);
         // need this for postMessage origin
-        this.mainWindow.origin = this.globalConfig.url;
+        this.mainWindow.origin = this.url;
 
         // Event needed to hide native menu bar on Windows 10 as we use custom menu bar
         this.mainWindow.webContents.once('did-start-loading', () => {