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

This commit is contained in:
Roberto E. Vargas Caballero 2014-04-15 08:11:47 +02:00
commit ebb6e03201

4
st.c
View file

@ -3737,8 +3737,8 @@ run(void) {
else else
cresize(xw.fw, xw.fh); cresize(xw.fw, xw.fh);
gettimeofday(&lastblink, NULL);
gettimeofday(&last, NULL); gettimeofday(&last, NULL);
lastblink = last;
for(xev = actionfps;;) { for(xev = actionfps;;) {
long deltatime; long deltatime;
@ -3773,7 +3773,7 @@ run(void) {
if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
tsetdirtattr(ATTR_BLINK); tsetdirtattr(ATTR_BLINK);
term.mode ^= MODE_BLINK; term.mode ^= MODE_BLINK;
gettimeofday(&lastblink, NULL); lastblink = now;
dodraw = 1; dodraw = 1;
} }
deltatime = TIMEDIFF(now, last); deltatime = TIMEDIFF(now, last);