Changeset 72090b

Timestamp:

Aug 30, 2016, 12:36:22 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

FragmentMolecule_checks_bonddegrees, Gui_Fixes

Children:

5c8056

Parents:

dde3d1

Message:

FIX: Pop..Action need to check whether stack is actually non-empty.

• this caused a segfault in python all-actions regression test.

File:

• src/World.cpp (modified) (2 diffs)

src/World.cpp

@@ -642 +642 @@
 
 void World::popAtomSelection(){
-  OBSERVE;
-  NOTIFY(SelectionChanged);
-  const atomIdsVector_t atomids = selectedAtoms_Stack.top();
-  boost::function<void (const atomId_t)> IdSelector =
-      boost::bind(static_cast<void (World::*)(const atomId_t)>(&World::selectAtom), this, _1);
-  unselectVectorOfInstances<AtomSet>(selectedAtoms.begin(), selectedAtoms.end());
-  selectedAtoms.clear();
-  std::for_each(atomids.begin(),atomids.end(), IdSelector);
-  selectedAtoms_Stack.pop();
+  if (!selectedAtoms_Stack.empty()) {
+    OBSERVE;
+    NOTIFY(SelectionChanged);
+    const atomIdsVector_t atomids = selectedAtoms_Stack.top();
+    boost::function<void (const atomId_t)> IdSelector =
+        boost::bind(static_cast<void (World::*)(const atomId_t)>(&World::selectAtom), this, _1);
+    unselectVectorOfInstances<AtomSet>(selectedAtoms.begin(), selectedAtoms.end());
+    selectedAtoms.clear();
+    std::for_each(atomids.begin(),atomids.end(), IdSelector);
+    selectedAtoms_Stack.pop();
+  }
 }
 
@@ -825 +827 @@
 
 void World::popMoleculeSelection(){
-  OBSERVE;
-  NOTIFY(SelectionChanged);
-  const moleculeIdsVector_t moleculeids = selectedMolecules_Stack.top();
-  boost::function<void (const moleculeId_t)> IdSelector =
-      boost::bind(static_cast<void (World::*)(const moleculeId_t)>(&World::selectMolecule), this, _1);
-  unselectVectorOfInstances<MoleculeSet>(selectedMolecules.begin(), selectedMolecules.end());
-  selectedMolecules.clear();
-  std::for_each(moleculeids.begin(),moleculeids.end(), IdSelector);
-  selectedMolecules_Stack.pop();
+  if (!selectedMolecules_Stack.empty()) {
+    OBSERVE;
+    NOTIFY(SelectionChanged);
+    const moleculeIdsVector_t moleculeids = selectedMolecules_Stack.top();
+    boost::function<void (const moleculeId_t)> IdSelector =
+        boost::bind(static_cast<void (World::*)(const moleculeId_t)>(&World::selectMolecule), this, _1);
+    unselectVectorOfInstances<MoleculeSet>(selectedMolecules.begin(), selectedMolecules.end());
+    selectedMolecules.clear();
+    std::for_each(moleculeids.begin(),moleculeids.end(), IdSelector);
+    selectedMolecules_Stack.pop();
+  }
 }