aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero <k0ga@shike2.com>2014-04-15 08:11:47 +0200
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2014-04-15 08:11:47 +0200
commitebb6e03201ce0e5a00be7cff2e365ad3d6cb7195 (patch)
treec0de44bc36de376bc18e88ba3bd42551bbd29546
parent3cb80840dbf9add2b5f9c26da9650da39e34906d (diff)
parentf27b44b7c271bda4ad3a0c4043bb709e0a4e4fbb (diff)
downloadst-ebb6e03201ce0e5a00be7cff2e365ad3d6cb7195.tar.gz
st-ebb6e03201ce0e5a00be7cff2e365ad3d6cb7195.zip
Merge remote-tracking branch 'origin/master' into omaster
-rw-r--r--st.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/st.c b/st.c
index 6fef7f3..ced72ff 100644
--- a/st.c
+++ b/st.c
@@ -3737,8 +3737,8 @@ run(void) {
3737 else 3737 else
3738 cresize(xw.fw, xw.fh); 3738 cresize(xw.fw, xw.fh);
3739 3739
3740 gettimeofday(&lastblink, NULL);
3741 gettimeofday(&last, NULL); 3740 gettimeofday(&last, NULL);
3741 lastblink = last;
3742 3742
3743 for(xev = actionfps;;) { 3743 for(xev = actionfps;;) {
3744 long deltatime; 3744 long deltatime;
@@ -3773,7 +3773,7 @@ run(void) {
3773 if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { 3773 if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) {
3774 tsetdirtattr(ATTR_BLINK); 3774 tsetdirtattr(ATTR_BLINK);
3775 term.mode ^= MODE_BLINK; 3775 term.mode ^= MODE_BLINK;
3776 gettimeofday(&lastblink, NULL); 3776 lastblink = now;
3777 dodraw = 1; 3777 dodraw = 1;
3778 } 3778 }
3779 deltatime = TIMEDIFF(now, last); 3779 deltatime = TIMEDIFF(now, last);