From 48b5a8ff3e5d9d94ea22bb982a889681c1937c16 Mon Sep 17 00:00:00 2001
From: Gianfranco Palumbo <gpalumbo@cartrawler.com>
Date: Fri, 2 Oct 2020 18:32:50 +0100
Subject: [PATCH 1/3] save setting before closing

---
 src/app/help/help.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/help/help.js b/src/app/help/help.js
index 6631cff..8f969c1 100644
--- a/src/app/help/help.js
+++ b/src/app/help/help.js
@@ -20,8 +20,8 @@ document.querySelector('.next-step').addEventListener('click', () => {
 	if (currentStep === 5) {
 		document.querySelector('.next-step .btn__inner').textContent = 'Got it!';
 		document.querySelector('.next-step').addEventListener('click', () => {
-			browserWindow.close();
 			dataStore.saveSettings('tutorialShown', true);
+			browserWindow.close();
 		});
 	}
 });

From bf5a2885d69b8366236632561882ac0232ccbea9 Mon Sep 17 00:00:00 2001
From: Gianfranco Palumbo <gpalumbo@cartrawler.com>
Date: Fri, 2 Oct 2020 18:33:36 +0100
Subject: [PATCH 2/3] minor: move variable and rename it from 'hidden' to
 'showRuler'

---
 main.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/main.js b/main.js
index b061a40..a82db50 100644
--- a/main.js
+++ b/main.js
@@ -18,6 +18,7 @@ let rulers;
 let settingsWindow;
 let helpWindow;
 let lastFocusedRuler;
+let showRuler = false;
 
 /**
  * Create a ruler window and push it to the `rulers` array. The ruler window
@@ -88,8 +89,6 @@ function showHelp() {
 	});
 }
 
-let hidden = false;
-
 /**
  * Toggle a ruler asynchronously and give back a promise.
  * @param {BrowserWindow} ruler - The ruler to toggle
@@ -97,7 +96,7 @@ let hidden = false;
  */
 const toggleRuler = ruler => {
 	return new Promise(resolve => setTimeout(() => {
-		ruler[hidden ? 'hide' : 'show']();
+		ruler[showRuler ? 'show' : 'hide']();
 		resolve();
 	}));
 };
@@ -110,7 +109,7 @@ function toggleRulerCommand() {
 		return;
 	}
 
-	hidden = !hidden;
+	showRuler = !showRuler;
 
 	// Close all rulers sequentially. Doing otherwise doesn't toggle them
 	// properly. This is most likely an issue with Electron.

From 988d0b0eb41b2ab9040edb674b0d3a56cc5d53b6 Mon Sep 17 00:00:00 2001
From: Gianfranco Palumbo <gpalumbo@cartrawler.com>
Date: Fri, 2 Oct 2020 18:38:48 +0100
Subject: [PATCH 3/3] minor: import 'electron' only once

---
 src/app/help/help.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/help/help.js b/src/app/help/help.js
index 8f969c1..57ebbd9 100644
--- a/src/app/help/help.js
+++ b/src/app/help/help.js
@@ -1,13 +1,12 @@
 'use strict';
 
-const ipc = require('electron').ipcRenderer;
-const remote = require('electron').remote;
+const { ipcRenderer, remote } = require('electron');
 const browserWindow = remote.getCurrentWindow();
 const dataStore = require('../../data-store');
 
 // When the help menu is loaded, we create a ruler
 // so the user can get a feel of how to use them.
-ipc.send('create-ruler', {
+ipcRenderer.send('create-ruler', {
 	x: browserWindow.getPosition()[0] + 274,
 	y: browserWindow.getPosition()[1] + 250
 });