Index: branches/BNC_2.12/src/bncantex.cpp
===================================================================
--- branches/BNC_2.12/src/bncantex.cpp	(revision 8075)
+++ branches/BNC_2.12/src/bncantex.cpp	(revision 8076)
@@ -65,4 +65,10 @@
     it.next();
     delete it.value();
+  }
+  if (newAntMap) {
+    delete newAntMap;
+  }
+  if (newFrqMap) {
+    delete newFrqMap;
   }
 }
@@ -127,6 +133,6 @@
   QTextStream in(&inFile);
 
-  t_antMap* newAntMap = 0;
-  t_frqMap* newFrqMap = 0;
+  newAntMap = 0;
+  newFrqMap = 0;
 
   while ( !in.atEnd() ) {
Index: branches/BNC_2.12/src/bncantex.h
===================================================================
--- branches/BNC_2.12/src/bncantex.h	(revision 8075)
+++ branches/BNC_2.12/src/bncantex.h	(revision 8076)
@@ -81,4 +81,6 @@
 
   QMap<QString, t_antMap*> _maps;
+  t_antMap* newAntMap;
+  t_frqMap* newFrqMap;
 };
 
Index: branches/BNC_2.12/src/bncephuser.cpp
===================================================================
--- branches/BNC_2.12/src/bncephuser.cpp	(revision 8075)
+++ branches/BNC_2.12/src/bncephuser.cpp	(revision 8076)
@@ -211,33 +211,27 @@
   double timeDiff = fabs(toc - currentTime);
 
-  if      (eph->type() == t_eph::GPS  || t_eph::Galileo) {
-    if (timeDiff > 4*3600) { // update interval: 2h, data sets are valid for 4 hours
-      eph->setCheckState(t_eph::outdated);
-      return;
-    }
-  }
-  else if (eph->type() == t_eph::GLONASS) {
-    if (timeDiff > 1*3600) { // updated every 30 minutes
-      eph->setCheckState(t_eph::outdated);
-      return;
-    }
-  }
-  else if (eph->type() == t_eph::QZSS) {
-    if (timeDiff > 4*3600) { // orbit parameters are valid for 7200 seconds (at minimum)
-      eph->setCheckState(t_eph::outdated);
-      return;
-    }
-  }
-  else if (eph->type() == t_eph::SBAS) {
-    if (timeDiff > 600) { // maximum update interval: 300 sec
-      eph->setCheckState(t_eph::outdated);
-      return;
-    }
-  }
-  else if (eph->type() == t_eph::BDS) {
-    if (timeDiff > 6*3600) { // updates 1 (GEO) up to 6 hours
-      eph->setCheckState(t_eph::outdated);
-      return;
-    }
+  if      (eph->type() == t_eph::GPS     && timeDiff > 4*3600) { // update interval: 2h, data sets are valid for 4 hours
+    eph->setCheckState(t_eph::outdated);
+    return;
+  }
+  else if (eph->type() == t_eph::Galileo && timeDiff > 4*3600) { // update interval: 2h, data sets are valid for 4 hours
+    eph->setCheckState(t_eph::outdated);
+    return;
+  }
+  else if (eph->type() == t_eph::GLONASS && timeDiff > 1*3600) { // updated every 30 minutes
+    eph->setCheckState(t_eph::outdated);
+    return;
+  }
+  else if (eph->type() == t_eph::QZSS    && timeDiff > 4*3600) { // orbit parameters are valid for 7200 seconds (at minimum)
+    eph->setCheckState(t_eph::outdated);
+    return;
+  }
+  else if (eph->type() == t_eph::SBAS    && timeDiff > 600) { // maximum update interval: 300 sec
+    eph->setCheckState(t_eph::outdated);
+    return;
+  }
+  else if (eph->type() == t_eph::BDS     && timeDiff > 6*3600) { // updates 1 (GEO) up to 6 hours
+    eph->setCheckState(t_eph::outdated);
+    return;
   }