Changes in src/Atom/AtomicInfo.cpp [7e51e1:d05088]

File:

• src/Atom/AtomicInfo.cpp (modified) (1 diff)

src/Atom/AtomicInfo.cpp

@@ -88 +88 @@
   bool status = true;
   if (_atom.getId() != Id)
-    status = _atom.changeId(Id);
+    status &= _atom.changeId(Id);
 
   // set its father
-  atom * const _father = World::getInstance().getAtom(AtomById(FatherId));
-  if (_father == NULL)
-    _atom.father = &_atom;
-  else
-    _atom.father = _father;
+  if (status) {
+    atom * const _father = World::getInstance().getAtom(AtomById(FatherId));
+    if ((_father == NULL) || (Id == FatherId)) {
+      _atom.father = &_atom;
+      // don't sign on
+    } else {
+      _atom.father = _father;
+      _father->signOn(&_atom);
+    }
 
-  // setting molecule
-  molecule * const _mol = World::getInstance().getMolecule(MoleculeById(MolId));
-  if (_mol != NULL)
-    _atom.setMolecule(_mol); // this is ok, mol is const within AtomicInfo, but not outside (atoms need to register)
-  _atom.changeNr(Nr);
+    // setting molecule
+    molecule * const _mol = World::getInstance().getMolecule(MoleculeById(MolId));
+    if (_mol != NULL)
+      _atom.setMolecule(_mol); // this is ok, mol is const within AtomicInfo, but not outside (atoms need to register)
+    _atom.changeNr(Nr);
+  }
 
   return status;