Index: trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- trunk/BNC/src/combination/bnccomb.cpp	(revision 10199)
+++ trunk/BNC/src/combination/bnccomb.cpp	(revision 10200)
@@ -486,8 +486,8 @@
     // ----------------------------
     if (BNC_CORE->mode() != t_bncCore::batchPostProcessing) {
-      if ((newClk->_time >= currentTime) ||        // future time stamp
+      if ((newClk->_time >= currentTime) ||       // future time stamp
           (currentTime - newClk->_time) > 60.0) { // very old data sets
   #ifdef BNC_DEBUG_CMB
-        emit newMessage("bncComb: very old data sets: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() +
+        emit newMessage("bncComb: future or very old data sets: " + acName.toLatin1() + " " + newClk->_prn.toString().c_str() +
             QString(" %1 ").arg(newClk->_time.timestr().c_str()).toLatin1() + "vs. current time" +
             QString(" %1 ").arg(currentTime.timestr().c_str()).toLatin1(), true);
@@ -546,5 +546,5 @@
   // Make sure the buffer does not grow beyond any limit
   // ---------------------------------------------------
-  const unsigned MAX_EPODATA_SIZE = 12;
+  const unsigned MAX_EPODATA_SIZE = 60.0 / _cmbSampl;
   if (_epoClkData.size() > MAX_EPODATA_SIZE) {
     delete _epoClkData.front();
@@ -564,10 +564,11 @@
     bncTime epoTime = _epoClkData.front()->_time;
 
-    if ((currentTime - epoTime) > 60.0) {
-      delete _epoClkData.front();
-      _epoClkData.pop_front();
-      continue;
-    }
-
+    if (BNC_CORE->mode() != t_bncCore::batchPostProcessing) {
+      if ((currentTime - epoTime) > 60.0) {
+        delete _epoClkData.front();
+        _epoClkData.pop_front();
+        continue;
+      }
+    }
     // Process the front epoch
     // -----------------------