Fix double delete

src/sst/core/checkpointAction.cc

@@ -90,4 +90,10 @@ CheckpointAction::setCheckpoint()
     generate_ = true;
 }
 
+SimTime_t
+CheckpointAction::getNextCheckpointSimTime()
+{
+    return next_sim_time_;
+}
+
 } // namespace SST

src/sst/core/checkpointAction.h

@@ -48,6 +48,9 @@ class CheckpointAction : public Action
     /** Called by SyncManager to check whether a checkpoint should be generated */
     void check();
 
+    /** Return next checkpoint time */
+    SimTime_t getNextCheckpointSimTime();
+
     NotSerializable(SST::CheckpointAction);
 
 private:

src/sst/core/simulation.cc

@@ -95,7 +95,11 @@ Simulation_impl::minPartToTC(SimTime_t cycles) const
 Simulation_impl::~Simulation_impl()
 {
     // Clean up as best we can
-    delete checkpoint_action_;
+
+    // If checkpoint_action is triggered on sim time then it will
+    // be deleted when the timeVortex is deleted
+    if ( checkpoint_action_->getNextCheckpointSimTime() == 0 )
+        delete checkpoint_action_;
 
     // Delete the timeVortex first.  This will delete all events left
     // in the queue, as well as the Sync, Exit and Clock objects.