fixing cleanup crash fix #12223

eclipse-sumo · Dec 5, 2022 · ae8fc1d · ae8fc1d
1 parent fb62c06
commit ae8fc1d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/netbuild/NBEdgeCont.cpp b/src/netbuild/NBEdgeCont.cpp
@@ -417,8 +417,10 @@ NBEdgeCont::extract(NBDistrictCont& dc, NBEdge* edge, bool remember) {
     if (remember) {
         const auto& prevExtracted = myExtractedEdges.find(edge->getID());
         if (prevExtracted != myExtractedEdges.end()) {
-            myEdgeCemetery.push_back(prevExtracted->second);
-            prevExtracted->second = edge;
+            if (edge != prevExtracted->second) {
+                myEdgeCemetery.insert(prevExtracted->second);
+                prevExtracted->second = edge;
+            }
         } else {
             myExtractedEdges[edge->getID()] = edge;
         }

diff --git a/src/netbuild/NBEdgeCont.h b/src/netbuild/NBEdgeCont.h
@@ -715,7 +715,7 @@ class NBEdgeCont {
     EdgeCont myExtractedEdges;
 
     /// @brief The edges which got extracted twice but may still be referenced somewhere TODO smart_ptr?
-    EdgeVector myEdgeCemetery;
+    std::set<NBEdge*> myEdgeCemetery;
 
     /// @brief The ids of ignored edges
     std::set<std::string> myIgnoredEdges;