From fb9b772db0056d01d0ee5fc79fdf00d59bfe9237 Mon Sep 17 00:00:00 2001 From: Geoffrey McRae Date: Sun, 9 Aug 2020 15:54:45 +1000 Subject: [PATCH] [client] we are getting the clock anyway, just reset the time --- VERSION | 2 +- client/src/main.c | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/VERSION b/VERSION index afdbd993..61852038 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -B2-rc2-28-g19c2fe9b5e+1 \ No newline at end of file +B2-rc2-29-g302b988524+1 \ No newline at end of file diff --git a/client/src/main.c b/client/src/main.c index 2c1bd70f..fa51e6d2 100644 --- a/client/src/main.c +++ b/client/src/main.c @@ -159,22 +159,12 @@ static int renderThread(void * unused) { if (state.frameTime > 0) { - tsAdd(&time, state.frameTime); - - // if our clock is too far out of sync, resync it - // this can happen when switching to/from a TTY, or due to clock drift - // we only check this once every 100 frames if (++resyncCheck == 100) { resyncCheck = 0; - - struct timespec end, diff; - clock_gettime(CLOCK_REALTIME, &end); - tsDiff(&diff, &time, &end); - if (diff.tv_sec > 0 || diff.tv_nsec > 1000000000 || // 100ms - diff.tv_sec < 0 || diff.tv_nsec < 0) // underflow - clock_gettime(CLOCK_REALTIME, &time); + clock_gettime(CLOCK_REALTIME, &time); } + tsAdd(&time, state.frameTime); } if (state.lgrResize)