From: Rob Pilling Date: Wed, 19 Jun 2013 20:24:01 +0000 (+0100) Subject: Fixed lock up when system time jumps backwards X-Git-Url: https://git.armaanb.net/?a=commitdiff_plain;h=489982d4b8442af25a380f8c22be542055cda81f;p=st.git Fixed lock up when system time jumps backwards Signed-off-by: Christoph Lohmann <20h@r-36.net> --- diff --git a/st.c b/st.c index 50b58a7..d0a6218 100644 --- a/st.c +++ b/st.c @@ -3687,6 +3687,8 @@ run(void) { gettimeofday(&last, NULL); for(xev = actionfps;;) { + long deltatime; + FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); @@ -3720,8 +3722,9 @@ run(void) { gettimeofday(&lastblink, NULL); dodraw = 1; } - if(TIMEDIFF(now, last) \ - > (xev? (1000/xfps) : (1000/actionfps))) { + deltatime = TIMEDIFF(now, last); + if(deltatime > (xev? (1000/xfps) : (1000/actionfps)) + || deltatime < 0) { dodraw = 1; last = now; }