From f903c7cfc49774ddd64ea999ca8bd3eddfaeaa0f Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Wed, 12 Jan 2011 18:14:15 +0000
Subject: [PATCH] - client: tweak [22842] so that system clock changes     of <
 60 seconds are ignored

svn path=/trunk/boinc/; revision=22897
---
 checkin_notes         | 7 +++++++
 client/client_state.h | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/checkin_notes b/checkin_notes
index 685039a7b1..784934cbd3 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -88,3 +88,10 @@ David  11 Jan 2011
     client/
         cs_apps.cpp
         pers_file_xfer.cpp
+
+David  12 Jan 2011
+    - client: tweak [22842] so that system clock changes
+        of < 60 seconds are ignored
+
+    client/
+        client_state.h
diff --git a/client/client_state.h b/client/client_state.h
index 9e299d988d..846e636518 100644
--- a/client/client_state.h
+++ b/client/client_state.h
@@ -253,7 +253,7 @@ struct CLIENT_STATE {
     void clear_absolute_times();
     inline void set_now() {
         double x = dtime();
-        if (x < now) {
+        if (x < (now-60)) {
             clear_absolute_times();
         }
         now = x;