Remove the current connection when user cancels the operation (#7036)

OpenModelica · Dec 9, 2020 · ee1f19d · ee1f19d
1 parent 9a3f6a9
commit ee1f19d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp
@@ -2225,6 +2225,8 @@ void GraphicsView::addConnection(Element *pComponent)
         }
       }
     }
+    // Once we are done creating the connection then we should set mpConnectionLineAnnotation to 0.
+    mpConnectionLineAnnotation = 0;
   }
 }
 
@@ -2234,11 +2236,11 @@ void GraphicsView::addConnection(Element *pComponent)
  */
 void GraphicsView::removeCurrentConnection()
 {
-  if (isCreatingConnection()) {
-    setIsCreatingConnection(false);
-    deleteConnectionFromList(mpConnectionLineAnnotation);
-    removeItem(mpConnectionLineAnnotation);
-    delete mpConnectionLineAnnotation;
+  setIsCreatingConnection(false);
+  deleteConnectionFromList(mpConnectionLineAnnotation);
+  removeItem(mpConnectionLineAnnotation);
+  if (mpConnectionLineAnnotation) {
+    mpConnectionLineAnnotation->deleteLater();
     mpConnectionLineAnnotation = 0;
   }
 }