diff --git a/installer/win/Symphony-x64.aip b/installer/win/Symphony-x64.aip
index 7ac5e6de..d6519be4 100644
--- a/installer/win/Symphony-x64.aip
+++ b/installer/win/Symphony-x64.aip
@@ -4,9 +4,9 @@
|
- |
|
|
+ |
|
|
|
@@ -20,27 +20,21 @@
|
|
|
- |
|
|
|
|
|
- |
- |
|
|
|
|
|
|
- |
|
- |
|
|
|
- |
|
|
|
@@ -48,7 +42,7 @@
|
|
|
- |
+ |
|
|
|
@@ -137,7 +131,7 @@
|
- |
+ |
|
|
|
@@ -351,21 +345,6 @@
|
|
-
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
-
|
|
@@ -374,33 +353,6 @@
|
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
|
|
|
@@ -445,15 +397,10 @@
|
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
|
|
|
@@ -491,32 +438,6 @@
|
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
- |
|
|
|
@@ -537,8 +458,6 @@
- |
- |
@@ -561,20 +480,13 @@
|
|
|
- |
+ |
|
|
- |
- |
- |
- |
|
- |
+ |
|
|
- |
- |
- |
|
|
|
@@ -643,10 +555,6 @@
|
|
|
- |
- |
- |
- |
|
|
|
@@ -658,15 +566,16 @@
|
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
|
@@ -679,7 +588,6 @@
|
|
|
- |
|
|
|
@@ -700,21 +608,17 @@
|
|
|
- |
- |
|
|
|
|
- |
+ |
|
|
- |
|
|
- |
|
@@ -726,8 +630,6 @@
|
|
|
- |
- |
|
|
|
@@ -743,10 +645,11 @@
|
|
|
+ |
|
+ |
|
|
-
|
diff --git a/src/app/main.ts b/src/app/main.ts
index d4f0ff71..12da0d36 100644
--- a/src/app/main.ts
+++ b/src/app/main.ts
@@ -67,9 +67,6 @@ const startApplication = async () => {
await app.whenReady();
logger.info(`main: app is ready, performing initial checks`);
createAppCacheFile();
- windowHandler.createApplication();
- logger.info(`main: created application`);
-
if (config.isFirstTimeLaunch()) {
logger.info(`main: This is a first time launch! will update config and handle auto launch`);
await config.setUpFirstTimeLaunch();
@@ -77,9 +74,10 @@ const startApplication = async () => {
await autoLaunchInstance.handleAutoLaunch();
}
}
-
// Setup session properties only after app ready
setSessionProperties();
+ await windowHandler.createApplication();
+ logger.info(`main: created application`);
};
// Handle multiple/single instances
diff --git a/src/app/window-handler.ts b/src/app/window-handler.ts
index c1e04be1..a84f3a49 100644
--- a/src/app/window-handler.ts
+++ b/src/app/window-handler.ts
@@ -85,6 +85,7 @@ export class WindowHandler {
public screenShareIndicatorFrameUtil: string;
public shouldShowWelcomeScreen: boolean = false;
+ private readonly defaultPodUrl: string = 'https://my.symphony.com';
private readonly contextIsolation: boolean;
private readonly backgroundThrottling: boolean;
private readonly windowOpts: ICustomBrowserWindowConstructorOpts;
@@ -174,8 +175,9 @@ export class WindowHandler {
this.url = WindowHandler.getValidUrl(this.userConfig.url ? this.userConfig.url : this.globalConfig.url);
logger.info(`window-handler: setting url ${this.url} from config file!`);
- if (this.globalConfig.url.startsWith('https://my.symphony.com') && !this.userConfig.url) {
+ if (config.isFirstTimeLaunch()) {
this.shouldShowWelcomeScreen = true;
+ this.url = this.defaultPodUrl;
isMaximized = false;
isFullScreen = false;
DEFAULT_HEIGHT = 333;
@@ -441,7 +443,7 @@ export class WindowHandler {
return;
}
- if (this.url.startsWith('https://my.symphony.com')) {
+ if (this.url.startsWith(this.defaultPodUrl)) {
this.url = format({
pathname: require.resolve('../renderer/react-window.html'),
protocol: 'file',