Index: trunk/BNC/src/GPSDecoder.cpp
===================================================================
--- trunk/BNC/src/GPSDecoder.cpp	(revision 6447)
+++ trunk/BNC/src/GPSDecoder.cpp	(revision 6448)
@@ -81,9 +81,8 @@
   if (_rnx) {
     long iSec    = long(floor(obs._time.gpssec()+0.5));
-    long obsTime = obs._time.gpsw() * 7*24*3600 + iSec;
     if (_rnx->samplingRate() == 0 || iSec % _rnx->samplingRate() == 0) {
       _rnx->deepCopy(obs);
     }
-    _rnx->dumpEpoch(format, obsTime);
+    _rnx->dumpEpoch(format, obs._time);
   }
 } 
Index: trunk/BNC/src/bncrinex.cpp
===================================================================
--- trunk/BNC/src/bncrinex.cpp	(revision 6447)
+++ trunk/BNC/src/bncrinex.cpp	(revision 6448)
@@ -387,5 +387,5 @@
 // Write One Epoch into the RINEX File
 ////////////////////////////////////////////////////////////////////////////
-void bncRinex::dumpEpoch(const QByteArray& format, long maxTime) {
+void bncRinex::dumpEpoch(const QByteArray& format, const bncTime& maxTime) {
 
   // Select observations older than maxTime
@@ -395,5 +395,5 @@
   while (mIt.hasNext()) {
     t_satObs obs = mIt.next();
-    if (obs._time.gpsw() * 7*24*3600 + obs._time.gpssec() < maxTime - 0.05) {
+    if (obs._time < maxTime) {
       obsList.push_back(obs);
       mIt.remove();
Index: trunk/BNC/src/bncrinex.h
===================================================================
--- trunk/BNC/src/bncrinex.h	(revision 6447)
+++ trunk/BNC/src/bncrinex.h	(revision 6448)
@@ -42,5 +42,5 @@
    int  samplingRate() const {return _samplingRate;}
    void deepCopy(t_satObs obs);
-   void dumpEpoch(const QByteArray& format, long maxTime);
+   void dumpEpoch(const QByteArray& format, const bncTime& maxTime);
    void setReconnectFlag(bool flag){_reconnectFlag = flag;}