beremiz

SVGHMI: fix HMI freeze at load when no screen saver is defined

2022-11-09, Edouard Tisserant
7e8db0b44e42
Parents 31aaec736e4d
Children 20f9f0c36ad6ed1ec3136c2bdb7e4952b64f
SVGHMI: fix HMI freeze at load when no screen saver is defined
1 files changed, 14 insertions(+), 13 deletions(-)
  • +14 -13
    svghmi/svghmi.js
    • --- a/svghmi/svghmi.js Tue Nov 08 11:03:45 2022 +0100
    +++ b/svghmi/svghmi.js Wed Nov 09 12:14:35 2022 +0100
    @@ -428,18 +428,22 @@
    e.preventDefault();
    });
    -var screensaver_timer = null;
    -function reset_screensaver_timer() {
    - if(screensaver_timer){
    - window.clearTimeout(screensaver_timer);
    +if(screensaver_delay){
    + var screensaver_timer = null;
    + function reset_screensaver_timer() {
    + if(screensaver_timer){
    + window.clearTimeout(screensaver_timer);
    + }
    + screensaver_timer = window.setTimeout(() => {
    + switch_page("ScreenSaver");
    + screensaver_timer = null;
    + }, screensaver_delay*1000);
    }
    - screensaver_timer = window.setTimeout(() => {
    - switch_page("ScreenSaver");
    - screensaver_timer = null;
    - }, screensaver_delay*1000);
    + document.body.addEventListener('pointerdown', reset_screensaver_timer);
    + // initialize screensaver
    + reset_screensaver_timer();
    }
    -if(screensaver_delay)
    - document.body.addEventListener('pointerdown', reset_screensaver_timer);
    +
    function detach_detachables() {
    @@ -601,9 +605,6 @@
    // show main page
    switch_page(default_page);
    -// initialize screensaver
    -reset_screensaver_timer();
    -
    var reconnect_delay = 0;
    var periodic_reconnect_timer;