From b4b3c1f0d40a88f70f9cc3ce3ef34b5f95d90d4b Mon Sep 17 00:00:00 2001
From: mauro-balades <mauro.balades@tutanota.com>
Date: Sun, 22 Sep 2024 22:39:51 +0200
Subject: [PATCH] Refactor ZenKeyboardShortcuts to use async/await for
 initialization and handle potential error when retrieving active workspace
 from cache

---
 src/ZenKeyboardShortcuts.mjs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/ZenKeyboardShortcuts.mjs b/src/ZenKeyboardShortcuts.mjs
index c775c07..55bfd5a 100644
--- a/src/ZenKeyboardShortcuts.mjs
+++ b/src/ZenKeyboardShortcuts.mjs
@@ -191,7 +191,7 @@ class KeyShortcutModifiers {
     }
 
     return new KeyShortcutModifiers(
-      modifiers['control'] == true,
+      modifiers['ctrl'] == true,
       modifiers['alt'] == true,
       modifiers['shift'] == true,
       modifiers['meta'] == true || modifiers['accel'] == true
@@ -203,8 +203,6 @@ class KeyShortcutModifiers {
       return new KeyShortcutModifiers(false, false, false, false);
     }
 
-    console.log(modifiers);
-
     return new KeyShortcutModifiers(
       modifiers.includes('control') || modifiers.includes('accel'),
       modifiers.includes('alt'),
@@ -233,7 +231,7 @@ class KeyShortcutModifiers {
   toString() {
     let str = '';
     if (this.#ctrl) {
-      str += 'control,';
+      str += 'accel,';
     }
     if (this.#alt) {
       str += 'alt,';
@@ -574,11 +572,11 @@ var gZenKeyboardShortcutsManager = {
     await this._saveShortcuts();
   },
 
-  getModifiableShortcuts() {
+  async getModifiableShortcuts() {
     let rv = [];
 
     if (!this._currentShortcutList) {
-      this._currentShortcutList = this._loadSaved();
+      this._currentShortcutList = await this._loadSaved();
     }
 
     for (let shortcut of this._currentShortcutList) {