From 3154a358e2988aa9aafd4ecd8c43c8bcc7c1605f Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Thu, 24 Jan 2019 17:29:21 +0100 Subject: Destroy loading canvas MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I948982b57f128bd3bd9832d0f877d2fe7e65ba03 Reviewed-by: Mårten Nordheim --- src/plugins/platforms/webgl/webqt.jsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/platforms/webgl/webqt.jsx b/src/plugins/platforms/webgl/webqt.jsx index 78d56d3..a3cdede 100644 --- a/src/plugins/platforms/webgl/webqt.jsx +++ b/src/plugins/platforms/webgl/webqt.jsx @@ -178,20 +178,18 @@ window.onload = function () { var time = 0.0; function draw() { - if (canvas) { - gl.uniform1f(timeLocation, time); - time += 0.01; - gl.drawArrays(gl.TRIANGLES, 0, 6); - setTimeout(draw, 16); - } + gl.uniform1f(timeLocation, time); + time += 0.01; + gl.drawArrays(gl.TRIANGLES, 0, 6); } - draw(); + canvas.timerId = setInterval(draw, 16); return canvas; }; var createCanvas = function (name, x, y, width, height, title) { var body = document.getElementsByTagName("body")[0]; if (initialLoadingCanvas) { + clearInterval(initialLoadingCanvas.timerId); body.removeChild(initialLoadingCanvas); initialLoadingCanvas = undefined; } @@ -1020,6 +1018,7 @@ window.onload = function () { var data = windowData[currentWindowId]; if (data.loadingCanvas) { var body = document.getElementsByTagName("body")[0]; + clearInterval(data.loadingCanvas.timerId); body.removeChild(data.loadingCanvas); data.loadingCanvas = undefined; } -- cgit v1.2.3