From 9bbb8f01f915ca82df252ac83c67ba025a2607ff Mon Sep 17 00:00:00 2001
From: Amitoj Singh <amitojsingh366@gmail.com>
Date: Tue, 11 May 2021 23:05:31 +0300
Subject: [PATCH] fix(baklava): macos crash

---
 baklava/package.json          |  4 ++--
 baklava/src/electron.ts       | 10 ++++------
 baklava/src/utils/keybinds.ts |  6 ++++++
 baklava/yarn.lock             | 10 +++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/baklava/package.json b/baklava/package.json
index 69c369225..c8459eee1 100644
--- a/baklava/package.json
+++ b/baklava/package.json
@@ -1,6 +1,6 @@
 {
     "name": "dogehouse",
-    "version": "1.0.68",
+    "version": "1.0.69",
     "description": "Taking voice conversations to the moon 🚀",
     "main": "./dist/electron.js",
     "scripts": {
@@ -118,7 +118,7 @@
         "electron-log": "^4.3.2",
         "electron-overlay-window": "^1.0.4",
         "electron-updater": "^4.3.8",
-        "globalkey": "^1.0.6",
+        "globalkey": "^1.0.7",
         "i18next": "^20.0.0",
         "i18next-node-fs-backend": "^2.1.3"
     },
diff --git a/baklava/src/electron.ts b/baklava/src/electron.ts
index 542c603b4..4e060d91f 100644
--- a/baklava/src/electron.ts
+++ b/baklava/src/electron.ts
@@ -11,7 +11,7 @@ import {
 import i18n from "i18next";
 import Backend from "i18next-node-fs-backend";
 import { autoUpdater } from "electron-updater";
-import { RegisterKeybinds } from "./utils/keybinds";
+import { exitApp, RegisterKeybinds } from "./utils/keybinds";
 
 import { HandleVoiceTray } from "./utils/tray";
 import {
@@ -25,7 +25,7 @@ import path from "path";
 import { StartNotificationHandler } from "./utils/notifications";
 import { bWindowsType } from "./types";
 import electronLogger from "electron-log";
-import { startRPC, stopRPC } from "./utils/rpc";
+import { startRPC } from "./utils/rpc";
 
 let mainWindow: BrowserWindow;
 let tray: Tray;
@@ -230,8 +230,7 @@ if (!instanceLock) {
   if (process.env.hotReload) {
     app.relaunch();
   }
-  stopRPC();
-  app.quit()
+  exitApp();
 } else {
   app.on("ready", () => {
     localize().then(async () => {
@@ -282,8 +281,7 @@ autoUpdater.on("update-not-available", () => {
   skipUpdateCheck(splash);
 });
 app.on("window-all-closed", async () => {
-  stopRPC();
-  app.quit()
+  exitApp();
 });
 app.on("activate", () => {
   if (mainWindow === null) {
diff --git a/baklava/src/utils/keybinds.ts b/baklava/src/utils/keybinds.ts
index 5856dc615..44dc84e39 100644
--- a/baklava/src/utils/keybinds.ts
+++ b/baklava/src/utils/keybinds.ts
@@ -139,3 +139,9 @@ export async function RegisterKeybinds(bWindows: bWindowsType) {
         up => { }
     );
 }
+
+export function exitApp() {
+    globalkey.stop();
+    stopRPC();
+    app.quit();
+}
diff --git a/baklava/yarn.lock b/baklava/yarn.lock
index 76de3eb34..66769bffd 100644
--- a/baklava/yarn.lock
+++ b/baklava/yarn.lock
@@ -1258,7 +1258,7 @@ __metadata:
     electron-log: ^4.3.2
     electron-overlay-window: ^1.0.4
     electron-updater: ^4.3.8
-    globalkey: ^1.0.6
+    globalkey: ^1.0.7
     i18next: ^20.0.0
     i18next-node-fs-backend: ^2.1.3
     lodash: ^4.17.21
@@ -1816,10 +1816,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globalkey@npm:^1.0.6":
-  version: 1.0.6
-  resolution: "globalkey@npm:1.0.6"
-  checksum: 6daf54a889313dfb3e11a2acf88e043a210ef1d3afa5e805cdcc598812268bb1cd1b60edf85d717be607d066d0c5c3f50bbaa177017a950b3874653256fda2b5
+"globalkey@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "globalkey@npm:1.0.7"
+  checksum: cbf4ab946601f7e5812430e5f585a326666df83b8d5d2e7cbfecb2251420fdad54e672ca46e4f7b6968404d828f2c716c43779c172bd6455241ede143e421300
   languageName: node
   linkType: hard