Changeset 3590 in ntrip for trunk/BNC

Timestamp:

Jan 19, 2012, 7:04:18 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/combination/bnccomb.cpp (modified) (2 diffs)

trunk/BNC/combination/bnccomb.cpp

@@ -314 +314 @@
       delete _orbitCorrs[corrID];
     }
-    _orbitCorrs[corrID] = new cmbCorr(*newCorr);
+    _orbitCorrs[corrID] = newCorr;
+    return;
+  }
+
+  // Merge with saved orbit correction
+  // ---------------------------------
+  else if (newCorr->dClkSet && !newCorr->raoSet) {
+    QString corrID = newCorr->ID();
+    if (_orbitCorrs.find(corrID) != _orbitCorrs.end()) {
+      mergeOrbitCorr(_orbitCorrs[corrID], newCorr);
+    }
   }
 
@@ -329 +339 @@
     delete newCorr;
     return;
-  }
-
-  // Merge with saved orbit correction
-  // ---------------------------------
-  if (newCorr->dClkSet && !newCorr->raoSet) {
-    QString corrID = newCorr->ID();
-    if (_orbitCorrs.find(corrID) != _orbitCorrs.end()) {
-      mergeOrbitCorr(_orbitCorrs[corrID], newCorr);
-    }
   }