Index: /trunk/BNC/src/bncephuser.cpp
===================================================================
--- /trunk/BNC/src/bncephuser.cpp	(revision 9772)
+++ /trunk/BNC/src/bncephuser.cpp	(revision 9773)
@@ -191,9 +191,18 @@
   }
 
+  // Check whether the epoch is too far away the current time
+  // --------------------------------------------------------
+  if (realTime) {
+    if (outDatedBcep(eph)) {
+      eph->setCheckState(t_eph::outdated);
+      return;
+    }
+  }
+
   // Check health status
   // -------------------
   if (eph->isUnhealthy()) {
     eph->setCheckState(t_eph::unhealthy);
-    //return;
+    return;
   }
 
@@ -213,13 +222,4 @@
     eph->setCheckState(t_eph::bad);
     return;
-  }
-
-  // Check whether the epoch is too far away the current time
-  // --------------------------------------------------------
-  if (realTime) {
-    if (outDatedBcep(eph)) {
-      eph->setCheckState(t_eph::outdated);
-      return;
-    }
   }
 
@@ -306,45 +306,2 @@
 }
 
-/*
-////////////////////////////////////////////////////////////////////////////
-bool bncEphUser::newCorrectedGpsEphSet(const t_eph* eph) {
-
-  if (eph->prn().system() != 'G') {
-    return false;
-  }
-
-  bool correctedGpsEphSet = false;
-  if ((fmod(eph->TOC().daysec()+16.0, 7200) == 0.0)) {
-    // sometimes corrected BRDC sets are sent with TOC values 16 seconds
-    // before the nominal TOC (integer time)
-    correctedGpsEphSet = true;
-  } else {
-    return false;
-  }
-
-  QString  prn  = QString(eph->prn().toInternalString().c_str());
-  t_eph*   ephL = ephLast(prn);
-  if (!ephL) {
-    // first set is a corrected set for GPS
-    if (correctedGpsEphSet) {
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-  else {
-    double dt = eph->TOC() - ephL->TOC();
-    if (correctedGpsEphSet) {
-      // set already available
-      if (dt == 0.0) {
-        return false;
-      }
-      else {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}*/