From 907084da99ab1456394ca04f5bf101690695ee6d Mon Sep 17 00:00:00 2001
From: Jaruba Firanelli <branza.alex@gmail.com>
Date: Wed, 6 Feb 2019 22:54:38 +0200
Subject: [PATCH] Only Load Page in App Window When It's Visible

---
 main.js         | 18 ++++--------------
 server/index.js |  1 +
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/main.js b/main.js
index 368ad28..961c9c2 100755
--- a/main.js
+++ b/main.js
@@ -144,20 +144,6 @@ function createWindow() {
   // and load the index.html of the app.
   let indexPath;
 
-  mainWindow.loadURL( 'http' + (server.isSSL ? 's': '') + '://127.0.0.1:' + server.port() + '/auth?token=' + server.masterKey );
-
-  // Don't show until we are ready and loaded
-  mainWindow.once('ready-to-show', () => {
-    // Open the DevTools automatically if developing
-
-//    if (process.platform == 'linux')
-//      mainWindow.show()
-
-    if (dev) {
-      mainWindow.webContents.openDevTools()
-    }
-  });
-
   mainWindow.on('close', (e) => {
     console.log('window-close')
 
@@ -215,10 +201,14 @@ if (process.platform == 'darwin' || process.platform == 'win32') {
 }
   const showApp = () => {
     if (!mainWindow.isVisible()) {
+      mainWindow.loadURL( 'http' + (server.isSSL ? 's': '') + '://127.0.0.1:' + server.port() + '/auth?token=' + server.masterKey );
       mainWindow.show()
       mainWindow.focus()
       if (app.dock && !app.dock.isVisible())
         app.dock.show()
+      if (dev) {
+        mainWindow.webContents.openDevTools()
+      }
     } else {
       mainWindow.focus()
     }
diff --git a/server/index.js b/server/index.js
index 6c4126c..8db7738 100755
--- a/server/index.js
+++ b/server/index.js
@@ -1646,6 +1646,7 @@ const mainServer = http.createServer(function(req, resp) {
     }
 
     if (method == 'closeWindow') {
+      mainWindow.loadURL( 'about:blank' );
       mainWindow.close()
       respond({})
       return