Merge remote-tracking branch 'origin/master' into omaster - st - Simple Terminal

Log

Files

Refs

README

LICENSE

---

commit ebb6e03201ce0e5a00be7cff2e365ad3d6cb7195

parent 3cb80840dbf9add2b5f9c26da9650da39e34906d

Author: Roberto E. Vargas Caballero 

Date:   Tue, 15 Apr 2014 08:11:47 +0200

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

Diffstat:
  st.c                                |       4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
---

diff --git 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);