From 59bed7593d6e48017579d6a65c0cffd56143a8b9 Mon Sep 17 00:00:00 2001
From: antelle <dmitryvit@gmail.com>
Date: Sat, 8 Aug 2020 12:20:08 +0200
Subject: [PATCH] fix #1581: double-clicking KeeWeb icon in Dock

---
 desktop/app.js   | 2 +-
 release-notes.md | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop/app.js b/desktop/app.js
index c9e7a4d9..db90affd 100644
--- a/desktop/app.js
+++ b/desktop/app.js
@@ -120,7 +120,7 @@ app.on('open-file', (e, path) => {
 });
 app.on('activate', () => {
     if (process.platform === 'darwin') {
-        if (appReady && !mainWindow) {
+        if (appReady && !mainWindow && appSettings) {
             createMainWindow();
         }
     }
diff --git a/release-notes.md b/release-notes.md
index e274d4d8..fddbd7da 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -2,6 +2,7 @@ Release notes
 -------------
 ##### v1.15.6 (2020-08-08)
 `-` fix #1553: empty fields display for templates  
+`-` fix #1581: double-clicking KeeWeb icon in Dock  
 
 ##### v1.15.5 (2020-06-13)
 `-` fix #1539: broken code signing on Windows