Removed references to distribution frames. Fix #15642

eclipse-sumo · Oct 28, 2024 · fe3f54c · fe3f54c
1 parent c97bcde
commit fe3f54c
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/netedit/GNENetHelper.cpp b/src/netedit/GNENetHelper.cpp
@@ -2548,6 +2548,7 @@ GNENetHelper::AttributeCarriers::insertDemandElement(GNEDemandElement* demandEle
 void
 GNENetHelper::AttributeCarriers::deleteDemandElement(GNEDemandElement* demandElement, const bool updateFrames) {
     const auto tag = demandElement->getTagProperty().getTag();
+    auto viewParent = myNet->getViewNet()->getViewParent();
     // find demanElement in demandElementTag
     auto itFind = myDemandElements.at(tag).find(demandElement->getGUIGlObject());
     // check if demandElement was previously inserted
@@ -2556,9 +2557,15 @@ GNENetHelper::AttributeCarriers::deleteDemandElement(GNEDemandElement* demandEle
     }
     // remove it from inspected elements and GNEElementTree
     myNet->getViewNet()->removeFromAttributeCarrierInspected(demandElement);
-    myNet->getViewNet()->getViewParent()->getInspectorFrame()->getHierarchicalElementTree()->removeCurrentEditedAttributeCarrier(demandElement);
-    myNet->getViewNet()->getViewParent()->getPersonPlanFrame()->getPersonHierarchy()->removeCurrentEditedAttributeCarrier(demandElement);
-    myNet->getViewNet()->getViewParent()->getContainerPlanFrame()->getContainerHierarchy()->removeCurrentEditedAttributeCarrier(demandElement);
+    viewParent->getInspectorFrame()->getHierarchicalElementTree()->removeCurrentEditedAttributeCarrier(demandElement);
+    viewParent->getPersonPlanFrame()->getPersonHierarchy()->removeCurrentEditedAttributeCarrier(demandElement);
+    viewParent->getContainerPlanFrame()->getContainerHierarchy()->removeCurrentEditedAttributeCarrier(demandElement);
+    if (viewParent->getRouteDistributionFrame()->getDistributionSelector()->getCurrentDistribution() == demandElement) {
+        viewParent->getRouteDistributionFrame()->getDistributionSelector()->setDistribution(nullptr);
+    }
+    if (viewParent->getTypeDistributionFrame()->getDistributionSelector()->getCurrentDistribution() == demandElement) {
+        viewParent->getTypeDistributionFrame()->getDistributionSelector()->setDistribution(nullptr);
+    }
     // if is the last inserted route, remove it from GNEViewNet
     if (myNet->getViewNet()->getLastCreatedRoute() == demandElement) {
         myNet->getViewNet()->setLastCreatedRoute(nullptr);