Merge remote-tracking branch 'origin/master' into omaster

[st.git] / st.c

diff --git a/st.c b/st.c
index 6fef7f3..ced72ff 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3737,8 +3737,8 @@ run(void) {
        else
                cresize(xw.fw, xw.fh);
 
        else
                cresize(xw.fw, xw.fh);
 

-       gettimeofday(&lastblink, NULL);

        gettimeofday(&last, NULL);
        gettimeofday(&last, NULL);

+       lastblink = last;

 
        for(xev = actionfps;;) {
                long deltatime;
 
        for(xev = actionfps;;) {
                long deltatime;


@@ -3773,7 +3773,7 @@ run(void) {
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;
                if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
                        tsetdirtattr(ATTR_BLINK);
                        term.mode ^= MODE_BLINK;

-                       gettimeofday(&lastblink, NULL);
+                       lastblink = now;

                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);
                        dodraw = 1;
                }
                deltatime = TIMEDIFF(now, last);