Merge branch 'chrbayer.72-cr-broken' into 'master'

Revert "issue #48 Some Award Tracker hits don't produce alert script to be executed"

See merge request gridtracker.org/gridtracker!78
merge-requests/79/merge v1.21.0324-rc2
Matthew Chambers 2021-03-25 02:16:01 +00:00
commit 5d669d2210
1 zmienionych plików z 1 dodań i 3 usunięć

Wyświetl plik

@ -958,8 +958,6 @@ function viewRoster()
continue;
}
}
var shouldAlert = false;
if (isAwardTracker)
{
var tx = false;
@ -975,7 +973,6 @@ function viewRoster()
if (tx)
{
var x = g_awardTracker[award];
shouldAlert = true;
callRoster[callHash].callObj.awardReason =
g_awards[x.sponsor].awards[x.name].tooltip +
" (" +
@ -1056,6 +1053,7 @@ function viewRoster()
var wpx = "#FFFF00";
hasGtPin = false;
var shouldAlert = false;
var callsignBg,
gridBg,
callingBg,