From: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Tue, 15 Apr 2014 06:11:47 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into omaster
X-Git-Url: https://git.armaanb.net/?p=st.git;a=commitdiff_plain;h=ebb6e03201ce0e5a00be7cff2e365ad3d6cb7195;hp=3cb80840dbf9add2b5f9c26da9650da39e34906d

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

diff --git a/st.c b/st.c
index 6fef7f3..ced72ff 100644
--- 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);