From 76eee3493f45d6bf43fcfce628f80055249da284 Mon Sep 17 00:00:00 2001
From: Sebastian Delmont <sd@notso.net>
Date: Mon, 2 May 2022 08:11:41 -0400
Subject: [PATCH] Fixed nil leaks in roster processing

---
 package.nw/lib/roster/processRosterHunting.js | 3 ++-
 package.nw/lib/roster/rosterColumns.js        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.nw/lib/roster/processRosterHunting.js b/package.nw/lib/roster/processRosterHunting.js
index 15ee2c7b..f85c097e 100644
--- a/package.nw/lib/roster/processRosterHunting.js
+++ b/package.nw/lib/roster/processRosterHunting.js
@@ -65,6 +65,7 @@ function processRosterHunting(callRoster, rosterSettings)
 
       callObj.hunting = {}
       callObj.callFlags = {}
+	  callObj.style = callObj.style || {}
 
       let colorObject = Object();
 
@@ -141,7 +142,7 @@ function processRosterHunting(callRoster, rosterSettings)
           entry.tx = false;
           continue;
         }
-
+        
         // Special Calls
         if (callObj.DEcall.match("^[A-Z][0-9][A-Z](/w+)?$"))
         {
diff --git a/package.nw/lib/roster/rosterColumns.js b/package.nw/lib/roster/rosterColumns.js
index 9dc2b50b..2bb6147e 100644
--- a/package.nw/lib/roster/rosterColumns.js
+++ b/package.nw/lib/roster/rosterColumns.js
@@ -63,7 +63,7 @@ const ROSTER_COLUMNS = {
         html: html = callObj.DEcall.formatCallsign()
       }
 
-      let acks = window.opener.g_acknowledgedCalls;
+      let acks = window.opener.g_acknowledgedCalls || {};
       if (acks[callObj.DEcall])
       {
         attrs.html = `${attrs.html} <span class='acknowledged'><img class='ackBadge' src='${acks[callObj.DEcall].badge}'></span>`