From 5b33419b6421d7d198a978e79e22d0a76306cdb4 Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Wed, 8 Jun 2022 14:55:29 +0200
Subject: [PATCH] fix: exception on app start setting window title

---
 src/main/main.ts                                        | 2 +-
 src/renderer/components/TheSettingBar.vue               | 2 +-
 src/renderer/components/WorkspaceAddConnectionPanel.vue | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/main.ts b/src/main/main.ts
index 41e364c8..0b43c76b 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -92,7 +92,7 @@ else {
    });
 
    ipcMain.on('change-window-title', (event, title: string) => {
-      mainWindow.setTitle(title);
+      if (mainWindow) mainWindow.setTitle(title);
    });
 
    // quit application when all windows are closed
diff --git a/src/renderer/components/TheSettingBar.vue b/src/renderer/components/TheSettingBar.vue
index d5da4a84..7ebf58e1 100644
--- a/src/renderer/components/TheSettingBar.vue
+++ b/src/renderer/components/TheSettingBar.vue
@@ -129,7 +129,7 @@ export default {
       },
       tooltipPosition (e) {
          const el = e.target ? e.target : e;
-         const fromTop = window.pageYOffset + el.getBoundingClientRect().top - (el.offsetHeight / 4);
+         const fromTop = window.scrollY + el.getBoundingClientRect().top - (el.offsetHeight / 4);
          el.querySelector('.ex-tooltip-content').style.top = `${fromTop}px`;
       },
       getStatusBadge (uid) {
diff --git a/src/renderer/components/WorkspaceAddConnectionPanel.vue b/src/renderer/components/WorkspaceAddConnectionPanel.vue
index 390668b3..ea8c94b3 100644
--- a/src/renderer/components/WorkspaceAddConnectionPanel.vue
+++ b/src/renderer/components/WorkspaceAddConnectionPanel.vue
@@ -543,9 +543,9 @@ export default {
 
          this.isTesting = false;
       },
-      saveConnection () {
+      async saveConnection () {
+         await this.addConnection(this.connection);
          this.selectWorkspace(this.connection.uid);
-         return this.addConnection(this.connection);
       },
       closeAsking () {
          this.isTesting = false;