diff --git a/package.nw/lib/roster/processRosterFiltering.js b/package.nw/lib/roster/processRosterFiltering.js index 234253dd..2400af8a 100644 --- a/package.nw/lib/roster/processRosterFiltering.js +++ b/package.nw/lib/roster/processRosterFiltering.js @@ -22,7 +22,7 @@ function processRosterFiltering(callRoster, rosterSettings) callObj.reset = true; continue; } - if (!callObj.dxcc || callObj.dxcc == -1) + if (!callObj.dxcc) { entry.tx = false; continue; @@ -238,12 +238,6 @@ function processRosterFiltering(callRoster, rosterSettings) continue; } - if (callObj.dxcc === -1) - { - entry.tx = false; - continue; - } - if (g_rosterSettings.hunting == "dxccs" && r_currentDXCCs != -1) { if (callObj.dxcc != r_currentDXCCs) diff --git a/package.nw/lib/roster/processRosterHunting.js b/package.nw/lib/roster/processRosterHunting.js index 2c3c9364..2b7d836f 100644 --- a/package.nw/lib/roster/processRosterHunting.js +++ b/package.nw/lib/roster/processRosterHunting.js @@ -44,7 +44,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker) } // Only render entries with `tx == true`, ignore the rest - if (callObj.dxcc != -1 && entry.tx == true) + if (entry.tx == true) { // In layered mode ("Hunting: mixed") the workHashSuffix becomes a more stricter 'live band', // while the layered suffix is a broader 'mixed band' @@ -294,7 +294,7 @@ function processRosterHunting(callRoster, rosterSettings, awardTracker) } // Hunting for DXCC - if (huntDXCC.checked) + if (huntDXCC.checked && callObj.dxcc && callObj.dxcc != -1) { let hash = String(callObj.dxcc) + "|" + workHashSuffix; let layeredHash = rosterSettings.layeredMode && (String(callObj.dxcc) + "|" + layeredHashSuffix)