From 769bf2bdedc258d4f9ac8890ec4e724210e3e274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 30 Apr 2007 12:38:30 +0000 Subject: [PATCH] Merging from old trunk: r652602 | lunakl | 2007-04-11 16:42:13 +0200 (Wed, 11 Apr 2007) | 4 lines Fix timestamp handling on 64bit platforms. BUG: 143545 svn path=/trunk/KDE/kdebase/workspace/; revision=659578 --- client.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client.cpp b/client.cpp index 2cd3bed456..3c22bc0806 100644 --- a/client.cpp +++ b/client.cpp @@ -980,7 +980,8 @@ void Client::pingWindow() void Client::gotPing( Time timestamp ) { - if( timestamp != ping_timestamp ) + // just plain compare is not good enough because of 64bit and truncating and whatnot + if( NET::timestampCompare( timestamp, ping_timestamp ) != 0 ) return; delete ping_timer; ping_timer = NULL;