Changeset 0249ce

Timestamp:

Sep 6, 2016, 2:36:17 PM (9 years ago)

Author:

Frederik Heber <heber@…>

Branches:

Action_Thermostats, Add_AtomRandomPerturbation, Add_FitFragmentPartialChargesAction, Add_RotateAroundBondAction, Add_SelectAtomByNameAction, Added_ParseSaveFragmentResults, Adding_Graph_to_ChangeBondActions, Adding_MD_integration_tests, Adding_StructOpt_integration_tests, Automaking_mpqc_open, AutomationFragmentation_failures, Candidate_v1.5.4, Candidate_v1.6.0, Candidate_v1.6.1, ChangeBugEmailaddress, ChangingTestPorts, ChemicalSpaceEvaluator, Combining_Subpackages, Debian_Package_split, Debian_package_split_molecuildergui_only, Disabling_MemDebug, Docu_Python_wait, EmpiricalPotential_contain_HomologyGraph, EmpiricalPotential_contain_HomologyGraph_documentation, Enable_parallel_make_install, Enhance_userguide, Enhanced_StructuralOptimization, Enhanced_StructuralOptimization_continued, Example_ManyWaysToTranslateAtom, Exclude_Hydrogens_annealWithBondGraph, FitPartialCharges_GlobalError, Fix_ChargeSampling_PBC, Fix_ChronosMutex, Fix_FitPartialCharges, Fix_FitPotential_needs_atomicnumbers, Fix_ForceAnnealing, Fix_IndependentFragmentGrids, Fix_ParseParticles, Fix_ParseParticles_split_forward_backward_Actions, Fix_PopActions, Fix_QtFragmentList_sorted_selection, Fix_Restrictedkeyset_FragmentMolecule, Fix_StatusMsg, Fix_StepWorldTime_single_argument, Fix_Verbose_Codepatterns, Fix_fitting_potentials, Fixes, ForceAnnealing_goodresults, ForceAnnealing_oldresults, ForceAnnealing_tocheck, ForceAnnealing_with_BondGraph, ForceAnnealing_with_BondGraph_continued, ForceAnnealing_with_BondGraph_continued_betteresults, ForceAnnealing_with_BondGraph_contraction-expansion, GeometryObjects, Gui_displays_atomic_force_velocity, IndependentFragmentGrids, IndependentFragmentGrids_IndividualZeroInstances, IndependentFragmentGrids_IntegrationTest, IndependentFragmentGrids_Sole_NN_Calculation, JobMarket_RobustOnKillsSegFaults, JobMarket_StableWorkerPool, JobMarket_unresolvable_hostname_fix, ODR_violation_mpqc_open, PartialCharges_OrthogonalSummation, PythonUI_with_named_parameters, QtGui_reactivate_TimeChanged_changes, Recreated_GuiChecks, RotateToPrincipalAxisSystem_UndoRedo, SaturateAtoms_findBestMatching, SaturateAtoms_singleDegree, StoppableMakroAction, Subpackage_CodePatterns, Subpackage_JobMarket, Subpackage_LinearAlgebra, Subpackage_levmar, Subpackage_mpqc_open, Subpackage_vmg, Switchable_LogView, ThirdParty_MPQC_rebuilt_buildsystem, TrajectoryDependenant_MaxOrder, TremoloParser_IncreasedPrecision, TremoloParser_MultipleTimesteps, Ubuntu_1604_changes, stable

Children:

3d61c7

Parents:

ed8a68

git-author:

Frederik Heber <heber@…> (08/30/16 12:36:22)

git-committer:

Frederik Heber <heber@…> (09/06/16 14:36:17)

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();
+  }
 }