From ec7efdea005774cf7fc2662088efc7cdcc7a02b0 Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Mon, 1 Aug 2022 19:34:16 +0200 Subject: [PATCH] fix reaper / releaseMem logic in conjunction with noVanish --- html/script.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/html/script.js b/html/script.js index 4bca464..545816b 100644 --- a/html/script.js +++ b/html/script.js @@ -2779,18 +2779,23 @@ let lastReap = 0; let reapInProgress = false; function reaper(all) { //console.log("Reaping started.."); - if (!all) { - releaseMem(); - } - if (noVanish && !all) - return; if (reapInProgress) { return; } + lastReap = now; + + if (noVanish && !all) { + return; + } + reapInProgress = true; + if (!all) { + releaseMem(); + } + // Look for planes where we have seen no messages for >300 seconds let plane; let length = g.planesOrdered.length; @@ -3446,10 +3451,12 @@ function releaseMem() { iconCache = {}; } + //console.trace(); //console.log('releaseMem()'); for (let i in g.planesOrdered) { - g.planesOrdered[i].clearMarker(); - g.planesOrdered[i].destroyTR(); + let plane = g.planesOrdered[i]; + plane.clearMarker(); + plane.destroyTR(); } refreshFeatures(); TAR.planeMan.redraw();