From 71c2f5cf18dd6d71ee5d74cf79914c7b0bbc466b Mon Sep 17 00:00:00 2001
From: mmdolze <mmdolze@users.sourceforge.net>
Date: Tue, 24 Feb 2009 21:09:52 +0000
Subject: [PATCH] Prevent server from stalling if time goes backwards (M.
 Vallevand)

---
 ChangeLog     | 1 +
 server/main.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 00753cd..b329e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,6 +62,7 @@ v.0.5dev (ongoing development)
  + new driver irtrans (Phant0m / Aron Parsons)
  + serialVFD driver: support Siemens/Wincor Nixdorf BA63/66 (Stefan Herdler)
  + new client lcdident.pl (Ethan Dicks)
+ * server: prevent stalling if time goes backwards (M. Vallevand)
 
 v.0.5.2
  * fix switching on/off the Load screen in lcdproc client using the menu
diff --git a/server/main.c b/server/main.c
index 792c8ac..3da1bc6 100644
--- a/server/main.c
+++ b/server/main.c
@@ -810,7 +810,7 @@ do_mainloop(void)
 #ifndef WIN32
 		gettimeofday(&t, NULL);
 		t_diff = t.tv_sec - last_t.tv_sec;
-		if ((t_diff + 1) > (LONG_MAX / 1e6)) {
+		if ( ((t_diff + 1) > (LONG_MAX / 1e6)) || (t_diff < 0) ) {
 			/* We're going to overflow the calculation - probably been to sleep, fudge the values */
 			t_diff = 0;
 			process_lag = 1;