From efca30743a24397fffbca5208ad54ab11b0fdfec Mon Sep 17 00:00:00 2001
From: Marat Fayzullin <luarvique@gmail.com>
Date: Thu, 2 Jan 2025 19:04:07 -0500
Subject: [PATCH] Moved settings load and shortcuts init around.

---
 htdocs/lib/Shortcuts.js | 3 +++
 htdocs/openwebrx.js     | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/lib/Shortcuts.js b/htdocs/lib/Shortcuts.js
index 2a4449d8..2213be1c 100644
--- a/htdocs/lib/Shortcuts.js
+++ b/htdocs/lib/Shortcuts.js
@@ -5,6 +5,9 @@
 function Shortcuts() {}
 
 Shortcuts.init = function(target) {
+    // Do not initialize twice
+    if (this.overlay) return;
+
     var that = this;
     target.addEventListener('keydown', function(e) { that.handleKey(e); });
 
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 1ee5627e..5110c570 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -978,13 +978,10 @@ function on_ws_recv(evt) {
                             Utils.setVesselUrl(config['vessel_url']);
                         }
 
-                        // Load user interface settings
+                        // Load user interface settings from local storage
                         UI.loadSettings();
                         Chat.loadSettings();
 
-                        // Initialize keyboard shortcuts
-                        Shortcuts.init(document.body);
-
                         break;
                     case "secondary_config":
                         var s = json['value'];
@@ -1217,6 +1214,9 @@ function onAudioStart(apiType){
 
     // Load audio settings from local storage
     UI.loadAudioSettings();
+
+    // Initialize keyboard shortcuts
+    Shortcuts.init(document.body);
 }
 
 var reconnect_timeout = false;