Skip to content

Commit

Permalink
Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Dec 12, 2024
2 parents 3fd67e1 + c479764 commit 7b03435
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/netedit/GNENetHelper.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ struct GNENetHelper {
friend class GNEAdditionalHandler;
friend class GNERouteHandler;
friend class GNEDataHandler;
friend class GNEMeanDataHandler;
friend class GNEJunction;
friend class GNEEdge;
friend class GNEDataSet;
Expand Down
2 changes: 2 additions & 0 deletions src/netedit/elements/data/GNEMeanDataHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ GNEMeanDataHandler::buildEdgeMeanData(const CommonXMLStructure::SumoBaseObject*
myNet->getViewNet()->getUndoList()->add(new GNEChange_MeanData(edgeMeanData, true), true);
myNet->getViewNet()->getUndoList()->end();
} else {
myNet->getAttributeCarriers()->insertMeanData(edgeMeanData);
edgeMeanData->incRef("buildEdgeMeanData");
}
}
Expand Down Expand Up @@ -100,6 +101,7 @@ GNEMeanDataHandler::buildLaneMeanData(const CommonXMLStructure::SumoBaseObject*
myNet->getViewNet()->getUndoList()->add(new GNEChange_MeanData(edgeMeanData, true), true);
myNet->getViewNet()->getUndoList()->end();
} else {
myNet->getAttributeCarriers()->insertMeanData(edgeMeanData);
edgeMeanData->incRef("buildEdgeMeanData");
}
}
Expand Down

0 comments on commit 7b03435

Please sign in to comment.