fix up some merge weirdness

[simgear.git] / simgear / timing / timestamp.cxx

diff --git a/simgear/timing/timestamp.cxx b/simgear/timing/timestamp.cxx
index 4d14a42acc16ed733b54b80d3fe76c26bd222383..7f7773f490174a7d1587e7ba990b450524428772 100644 (file)
--- a/simgear/timing/timestamp.cxx
+++ b/simgear/timing/timestamp.cxx
@@ -63,7 +63,7 @@ void SGTimeStamp::stamp() {
     unsigned int t;
     t = timeGetTime();
     _sec = t / 1000;
-    _nsec = ( t - ( seconds * 1000 ) ) * 1000 * 1000;
+    _nsec = ( t - ( _sec * 1000 ) ) * 1000 * 1000;
 #elif defined(_POSIX_TIMERS) && (0 < _POSIX_TIMERS)
     struct timespec ts;
 #if defined(_POSIX_MONOTONIC_CLOCK)