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

11 years ago · ebb6e03201
parent 3cb80840db f27b44b7c2
commit ebb6e03201
1 changed files with 2 additions and 2 deletions
--- a/st.c
+++ b/st.c
@ -3737,8 +3737,8 @@ run(void) {
 	else
 		cresize(xw.fw, xw.fh);

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

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