Now Junction geometry points can be edited again. Refs #6945

eclipse-sumo · Jul 13, 2020 · a71c198 · a71c198
1 parent 279951e
commit a71c198
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/netedit/GNEViewNetHelper.cpp b/src/netedit/GNEViewNetHelper.cpp
@@ -658,10 +658,11 @@ GNEViewNetHelper::MoveSingleElementValues::finishMoveSingleElement() {
         myPOIToMove = nullptr;
     } else if (myJunctionToMove) {
         // check if in the moved position there is another Junction and it will be merged
-        if (!myJunctionToMove->isShapeEdited() && !myViewNet->mergeJunctions(myJunctionToMove)) {
+        if (myJunctionToMove->isShapeEdited()) {
+            myJunctionToMove->commitJunctionShapeChange(myViewNet->getUndoList());
+        } else if (!myViewNet->mergeJunctions(myJunctionToMove)) {
             myJunctionToMove->commitGeometryMoving(myViewNet->getUndoList());
         }
-        myJunctionToMove->commitGeometryMoving(myViewNet->getUndoList());
         myJunctionToMove = nullptr;
     } else if (myEdgeToMove) {
         // commit change depending of what was moved