Fixed a bug preventing Vessel from quitting

aaroncox · Jan 3, 2018 · 4d89912 · 4d89912
1 parent e1e7bd7
commit 4d89912
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/app/app.html b/app/app.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Vessel - 0.2.3</title>
+    <title>Vessel - 0.2.4</title>
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.2.10/semantic.min.css" integrity="sha256-5+W3JHnvGYIJkVxUBsw+jBi9+pOlu9enPX3vZapXj5M=" crossorigin="anonymous" />
     <script>
       (function() {

diff --git a/app/main.dev.js b/app/main.dev.js
@@ -14,6 +14,7 @@ import { app, dialog, BrowserWindow } from 'electron';
 import MenuBuilder from './menu';
 
 let mainWindow = null;
+let promptWindow = null;
 let customURI
 
 if (process.env.NODE_ENV === 'production') {
@@ -69,7 +70,6 @@ async function createWindow() {
     width: 970,
     height: 750
   });
-
   // mainWindow.webContents.openDevTools()
 
   mainWindow.loadURL(`file://${__dirname}/app.html`);
@@ -87,6 +87,8 @@ async function createWindow() {
 
   mainWindow.on('closed', () => {
     mainWindow = null;
+    promptWindow = null;
+    app.quit();
   });
 
   const menuBuilder = new MenuBuilder(mainWindow);
@@ -100,7 +102,7 @@ async function createPrompt(event, url) {
   if(event) event.preventDefault()
   customURI = url
   var parse = require('url-parse');
-  const promptWindow = new BrowserWindow({
+  promptWindow = new BrowserWindow({
     alwaysOnTop: true,
     show: false,
     width: 500,
@@ -142,6 +144,12 @@ app.on('window-all-closed', () => {
   app.quit();
 });
 
+app.on('will-quit', () => {
+  mainWindow = null;
+  promptWindow = null;
+});
+
+
 function devToolsLog(s) {
   console.log(s)
   if (mainWindow && mainWindow.webContents) {

diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vessel",
   "productName": "vessel",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A simple wallet for managing your Steem accounts.",
   "main": "./main.prod.js",
   "author": {