Index: /trunk/BNC/src/combination/bnccomb.cpp
===================================================================
--- /trunk/BNC/src/combination/bnccomb.cpp	(revision 10242)
+++ /trunk/BNC/src/combination/bnccomb.cpp	(revision 10243)
@@ -132,10 +132,4 @@
     _cmbSampl = 5;
   }
-
-  _cmbWait  = settings.value("cmbWait").toInt();
-  if (_cmbWait <= 0) {
-    _cmbSampl = 10;
-  }
-
   _useGps = (Qt::CheckState(settings.value("cmbGps").toInt()) == Qt::Checked) ? true : false;
   if (_useGps) {
@@ -457,4 +451,5 @@
 void bncComb::slotNewClkCorrections(QList<t_clkCorr> clkCorrections) {
   QMutexLocker locker(&_mutex);
+  const double outWait = 1.0 * _cmbSampl;
   int    currentWeek = 0;
   double currentSec  = 0.0;
@@ -581,5 +576,5 @@
     // Process the front epoch
     // -----------------------
-    if (epoTime < (_lastClkCorrTime - _cmbWait)) {
+    if (epoTime < (_lastClkCorrTime - outWait)) {
       _resTime = epoTime;
       processEpoch(_resTime, clkCorrVec);
Index: /trunk/BNC/src/combination/bnccomb.h
===================================================================
--- /trunk/BNC/src/combination/bnccomb.h	(revision 10242)
+++ /trunk/BNC/src/combination/bnccomb.h	(revision 10243)
@@ -256,5 +256,4 @@
   e_method                                   _method;
   int                                        _cmbSampl;
-  int                                        _cmbWait;
   int                                        _ms;
   QMap<char, cmbEpoch>                       _buffer;