Index: trunk/BNC/src/upload/bncrtnetuploadcaster.cpp
===================================================================
--- trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9880)
+++ trunk/BNC/src/upload/bncrtnetuploadcaster.cpp	(revision 9881)
@@ -299,11 +299,10 @@
   // If there is there more than 1 epoch line in the buffer
   while (_rtnetStreamBuffer.count('*') > 1) {
-    cout << "more than 1 epoch in buffer: " << _rtnetStreamBuffer.count('*') << endl;    emit(newMessage(QString("bncRtnetUploadCaster: more than 1 epoch in buffer: %1").arg(_rtnetStreamBuffer.count('*')).toLatin1(), false));
+    cout << "more than 1 epoch in buffer: " << _rtnetStreamBuffer.count('*') << endl;
+    emit(newMessage(QString("bncRtnetUploadCaster: more than 1 epoch in buffer: %1").arg(_rtnetStreamBuffer.count('*')).toLatin1(), false));
     QString rtnetStreamBuffer = _rtnetStreamBuffer;
     int nextEpoch    = rtnetStreamBuffer.indexOf('*');
     int nextEpochEnd = rtnetStreamBuffer.indexOf("EOE");
     _rtnetStreamBuffer = _rtnetStreamBuffer.mid(1);
-    nextEpoch    = rtnetStreamBuffer.indexOf('*');
-    _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
     if      (nextEpoch != -1 && nextEpoch < iEpoEnd) {
       rtnetStreamBuffer = rtnetStreamBuffer.mid(nextEpoch);
@@ -312,4 +311,7 @@
         decodeRtnetEpoch(lines);
       }
+      nextEpoch    = _rtnetStreamBuffer.indexOf('*');
+      _rtnetStreamBuffer = _rtnetStreamBuffer.mid(nextEpoch);
+
     }
     else if (nextEpoch != -1 && nextEpoch >= iEpoEnd) {