Merge pull request #23 from ste2425/singleinstance

prevent multiple instances

ReleaseNotes.md

@@ -1,12 +1,12 @@
-## Version 0.2.1
+## Version 1.0.0
 ---
 
 Release highlights:
 
-* Added tray icon
+* Made single instance
 
 ---
 
-# Tray Icon
+# Single Instance
 
-It is now possible to minimize Dotnet Runner to the system tray. A tray icon has been created, when minimized clicking the icon will maximize the application.
+Dotnet Runner will now not allow multiple instances to be run. If an instance is already running that will instead be focused.

app/DotnetRunnerApp.js

@@ -273,6 +273,14 @@ module.exports = class DotnetRunnerApp {
         this._mainWindow.maximize();
     }
 
+    onSecondInstance() {
+        if (this._mainWindow.isMinimized())
+            this._mainWindow.restore();
+
+        this._mainWindow.show();
+        this._mainWindow.focus();
+    }
+
     once(...args) {
         this._mainWindow.once(...args);
     }

app/SplashScreenApp.js

@@ -15,6 +15,8 @@ module.exports = class SplashScreenApp {
 
         this.onReady;
 
+        this.ready = false;
+
         autoUpdater.on('checking-for-update', () => {
             this._splashWindow
                 .webContents.send('checking-for-update');
@@ -85,6 +87,14 @@ module.exports = class SplashScreenApp {
         this._splashWindow.close();
     }
 
+    onSecondInstance() {
+        if (this._splashWindow.isMinimized())
+            this._splashWindow.restore();
+
+        this._splashWindow.show();
+        this._splashWindow.focus();
+    }
+
     _executeOnReady() {
         const settings = {
             upgradePerformed: upgradeState.isUpgradeActive()
@@ -93,6 +103,8 @@ module.exports = class SplashScreenApp {
         if (settings.upgradePerformed)
             upgradeState.markUpgradeFinished();
 
+        this.ready = true;
+
         this.onReady(settings);
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dotnet-runner",
-  "version": "0.2.1",
+  "version": "1.0.0",
   "description": "Electron application to launch dotnet applications",
   "main": "startup.js",
   "scripts": {

startup.js

@@ -17,6 +17,7 @@ splashApp.onReady = function(settings) {
 
     dotnetApp.run({ displayReleaseNotes: preferences.autoOpenReleasenotes && settings.upgradePerformed })
         .once('ready-to-show', () => {
+
             splashApp.close();
             dotnetApp.show();
 
@@ -33,6 +34,21 @@ splashApp.onReady = function(settings) {
         });
 }
 app.on('ready', () => {
+    const shouldQuit = !app.requestSingleInstanceLock();
+
+    if (shouldQuit) {
+        app.quit();
+        return;
+    } else {
+        app.on('second-instance', () => {
+            if (splashApp.ready) {
+                dotnetApp.onSecondInstance();
+            } else {
+                splashApp.onSecondInstance();
+            }
+        });
+    }
+
     splashApp.run();
 });