From 182bde6a640a09b52c2baeea05fe1a6df1c7db6e Mon Sep 17 00:00:00 2001
From: Tag <tag.loomis@gmail.com>
Date: Sat, 27 Aug 2022 18:20:49 -0700
Subject: [PATCH 1/2] Fixed exception when oams server restarts

Also ignore unknown oams messages
---
 package.nw/lib/gt.js   | 2 +-
 package.nw/lib/gtws.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.nw/lib/gt.js b/package.nw/lib/gt.js
index fad8c73b..e1962fe2 100644
--- a/package.nw/lib/gt.js
+++ b/package.nw/lib/gt.js
@@ -6917,7 +6917,7 @@ function handleWsjtxDecode(newMessage)
     var hash = msgDEcallsign + newMessage.OB + newMessage.OM;
     if (hash in g_liveCallsigns) callsign = g_liveCallsigns[hash];
 
-    if (validQTH == "" && msgDEcallsign in g_gtCallsigns)
+    if (validQTH == "" && msgDEcallsign in g_gtCallsigns && g_gtCallsigns[msgDEcallsign] in g_gtFlagPins)
     {
       if (g_gtFlagPins[g_gtCallsigns[msgDEcallsign]].grid.length > 0) { validQTH = g_gtFlagPins[g_gtCallsigns[msgDEcallsign]].grid; }
     }
diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index f6a0a382..c5e3b99a 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -109,7 +109,8 @@ function gtConnectChat()
       }
       else
       {
-        g_gtState = ChatState.error;
+        // Not fatal!
+        console.log("Unknown oams message '" + jsmesg.type "' ignoring");
       }
     }
   };

From ae0f245cf192bc024e2678832e28c8f2cf2dcdb5 Mon Sep 17 00:00:00 2001
From: Tag <tag.loomis@gmail.com>
Date: Sat, 27 Aug 2022 18:23:02 -0700
Subject: [PATCH 2/2] missed +

---
 package.nw/lib/gtws.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.nw/lib/gtws.js b/package.nw/lib/gtws.js
index c5e3b99a..c683fb15 100644
--- a/package.nw/lib/gtws.js
+++ b/package.nw/lib/gtws.js
@@ -110,7 +110,7 @@ function gtConnectChat()
       else
       {
         // Not fatal!
-        console.log("Unknown oams message '" + jsmesg.type "' ignoring");
+        console.log("Unknown oams message '" + jsmesg.type + "' ignoring");
       }
     }
   };