Index: trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- trunk/BNC/src/combination/bnccomb.cpp	(revision 10227)
+++ trunk/BNC/src/combination/bnccomb.cpp	(revision 10229)
@@ -340,4 +340,6 @@
     _buffer.remove(sys);
   }
+  _params.clear();
+  _buffer.clear();
   _cmbSysPrn.clear();
 
@@ -346,5 +348,4 @@
     _epoClkData.pop_front();
   }
-
 }
 
@@ -377,5 +378,4 @@
 void bncComb::slotNewOrbCorrections(QList<t_orbCorr> orbCorrections) {
   QMutexLocker locker(&_mutex);
-
   for (int ii = 0; ii < orbCorrections.size(); ii++) {
     t_orbCorr& orbCorr = orbCorrections[ii];
@@ -443,4 +443,5 @@
     storage[satCodeBias._prn] = satCodeBias;
   }
+
 }
 
@@ -655,5 +656,5 @@
     // Create new correction
     // ---------------------
-    _newCorr       = new cmbCorr();
+    _newCorr                = new cmbCorr();
     _newCorr->_prn          = prn;
     _newCorr->_time         = clkCorr._time;
@@ -756,5 +757,4 @@
     // --------------------------------
     QVector<cmbCorr*>& corrs = _buffer[sys].corrs;
-
     QVectorIterator<cmbCorr*> itCorr(corrs);
     bool available = false;
@@ -763,5 +763,6 @@
       QString  prn  = corr->_prn;
       QString  acName = corr->_acName;
-      if (_newCorr->_acName == acName && _newCorr->_prn == prn) {
+      if (_newCorr->_acName == acName &&
+          _newCorr->_prn == prn) {
         available = true;
       }
@@ -861,5 +862,5 @@
     irc = processEpoch_singleEpoch(epoTime, sys, out, resCorr, dx);
   }
-
+  
   // Update Parameter Values, Print Results
   // --------------------------------------
@@ -895,5 +896,4 @@
     dumpResults(epoTime, resCorr);
   }
-
 }
 
@@ -1022,5 +1022,5 @@
 // Send results to RTNet Decoder and directly to PPP Client
 ////////////////////////////////////////////////////////////////////////////
-void bncComb::dumpResults(bncTime epoTime, const QMap<QString, cmbCorr*>& resCorr) {
+void bncComb::dumpResults(bncTime epoTime, QMap<QString, cmbCorr*>& resCorr) {
 
   QList<t_orbCorr> orbCorrections;
@@ -1036,5 +1036,5 @@
                                         year, month, day, hour, minute, sec);
 
-  QMapIterator<QString, cmbCorr*> it(resCorr);
+  QMutableMapIterator<QString, cmbCorr*> it(resCorr);
   while (it.hasNext()) {
     it.next();
@@ -1060,4 +1060,5 @@
     if (corr->_eph->getCrd(epoTime, xc, vv, true) != success) {
       delete corr;
+      it.remove();
       continue;
     }
@@ -1127,4 +1128,5 @@
     outLines += "\n";
     delete corr;
+    it.remove();
   }
 
Index: trunk/BNC/src/combination/bnccomb.h
===================================================================
--- trunk/BNC/src/combination/bnccomb.h	(revision 10227)
+++ trunk/BNC/src/combination/bnccomb.h	(revision 10229)
@@ -88,5 +88,7 @@
       isAPC = false;
     }
-    ~cmbAC() {}
+    ~cmbAC() {
+      numObs.clear();
+    }
     QString  mountPoint;
     QString  name;
@@ -234,5 +236,5 @@
   t_irc createAmat(char sys, Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP,
                    const ColumnVector& x0, QMap<QString, cmbCorr*>& resCorr);
-  void  dumpResults(bncTime epoTime, const QMap<QString, cmbCorr*>& resCorr);
+  void  dumpResults(bncTime epoTime, QMap<QString, cmbCorr*>& resCorr);
   void  printResults(bncTime epoTime, QTextStream& out, const QMap<QString, cmbCorr*>& resCorr);
   void  switchToLastEph(t_eph* lastEph, cmbCorr* corr);
@@ -246,7 +248,5 @@
   bncTime                                    _resTime;
   cmbCorr*                                   _newCorr;
-  QMap<char, cmbEpoch>                       _buffer;
   bncRtnetDecoder*                           _rtnetDecoder;
-  QMap<char, SymmetricMatrix>                _QQ;
   QByteArray                                 _log;
   bncAntex*                                  _antex;
@@ -256,8 +256,9 @@
   int                                        _cmbSampl;
   int                                        _ms;
+  QMap<char, cmbEpoch>                       _buffer;
+  QMap<char, SymmetricMatrix>                _QQ;
   QMap<char, QString>                        _masterOrbitAC;
   QMap<char, unsigned>                       _masterMissingEpochs;
   QMap<char, bool>                           _masterIsAPC;
-  QString                                    _cmbRefAttributes;
   QMap<char, QVector<cmbParam*>>              _params;
   QMap<QString, QMap<t_prn, t_orbCorr> >     _orbCorrections;
@@ -266,4 +267,5 @@
   bncEphUser                                 _ephUser;
   SsrCorr*                                   _ssrCorr;
+  QString                                    _cmbRefAttributes;
   bool                                       _useGps;
   bool                                       _useGlo;