Electron fixes

nerdic-coder · nerdic-coder · commit 612a69d077d2 · 2019-01-28T00:26:04.000+02:00
diff --git a/electron/main.js b/electron/main.js
@@ -6,8 +6,7 @@ const isDev = require('electron-is-dev');
 let BASE_URL = `file://${__dirname}/app/index.html`;
 let SCHEME = 'blockphotosapp';
 if (isDev) {
-//  BASE_URL = 'http://localhost:9876';
-
+  //  BASE_URL = 'http://localhost:9876';
 }
 
 protocol.registerStandardSchemes([SCHEME]);
@@ -26,29 +25,38 @@ if (!gotTheLock) {
 } else {
   app.on('second-instance', (event, commandLine) => {
     if (mainWindow && commandLine[1]) {
-        if (mainWindow.isMinimized()) {
-          mainWindow.restore();
-        }
+      if (mainWindow.isMinimized()) {
+        mainWindow.restore();
+      }
+
+      mainWindow.close();
+
+      mainWindow = new BrowserWindow({
+        width: 500,
+        height: 810,
+        icon: path.join(__dirname, 'icons/png/64x64.png')
+      });
 
-        var request = commandLine[1].split(":");
+      var request = commandLine[1].split(':');
 
-        if (request[1] && currentAuthResponse !== request[1]) {
-          currentAuthResponse = request[1];
+      if (request[1] && currentAuthResponse !== request[1]) {
+        currentAuthResponse = request[1];
 
-          mainWindow.focus();
-          mainWindow.loadURL(BASE_URL + '?authResponse=' + request[1]);
-          return true;
-        }
+        mainWindow.focus();
+        mainWindow.loadURL(BASE_URL + '?authResponse=' + request[1]);
+        return true;
+      }
     }
     dialog.showMessageBox({
-      message: "Authentication failed, please try again!",
-      buttons: ["OK"]
+      message: 'Authentication failed, please try again!',
+      buttons: ['OK']
     });
   });
 }
 
 // Handle creating/removing shortcuts on Windows when installing/uninstalling.
-if (require('electron-squirrel-startup')) { // eslint-disable-line global-require
+if (require('electron-squirrel-startup')) {
+  // eslint-disable-line global-require
   app.quit();
 }
 
@@ -81,31 +89,31 @@ const createWindow = () => {
 app.on('ready', createWindow);
 
 // Quit when all windows are closed.
-app.on('window-all-closed', function () {
+app.on('window-all-closed', function() {
   // On OS X it is common for applications and their menu bar
   // to stay active until the user quits explicitly with Cmd + Q
   if (process.platform !== 'darwin') {
     app.quit();
   }
-})
+});
 
-app.on('activate', function () {
+app.on('activate', function() {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
   if (mainWindow === null) {
     createWindow();
   }
-})
+});
 
-app.on('open-url', function (event, url) {
+app.on('open-url', function(event, url) {
   // On OS X it's common to re-create a window in the app when the
   // dock icon is clicked and there are no other windows open.
   if (mainWindow) {
     if (mainWindow.isMinimized()) {
       mainWindow.restore();
     }
 
-    var request = url.split(":");
+    var request = url.split(':');
 
     if (request[1] && currentAuthResponse !== request[1]) {
       currentAuthResponse = request[1];
@@ -116,10 +124,10 @@ app.on('open-url', function (event, url) {
     }
   }
   dialog.showMessageBox({
-    message: "Authentication failed, please try again!",
-    buttons: ["OK"]
+    message: 'Authentication failed, please try again!',
+    buttons: ['OK']
   });
-})
+});
 
 // In this file you can include the rest of your app's specific main process
 // code. You can also put them in separate files and require them here.
