Do not add within twice (#10317)

adeas31 · web-flow · commit acacec9911d6 · 2023-03-03T17:23:48.000+01:00
Fixes #10312 The models save inside a package does already have within.
diff --git a/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditLIB/Modeling/ModelWidgetContainer.cpp
@@ -5542,7 +5542,7 @@ bool ModelWidget::isNewApi()
 QString ModelWidget::getModelTextForOMCUndoCommand()
 {
   QString oldModelText = mpEditor->getPlainTextEdit()->toPlainText();
-  if (!mpLibraryTreeItem->isTopLevel()) {
+  if (!oldModelText.trimmed().startsWith("within") && !mpLibraryTreeItem->isTopLevel()) {
     oldModelText = "within " % mpLibraryTreeItem->parent()->getNameStructure() % ";\n" % oldModelText;
   }
   return oldModelText;

Original file line number	Diff line number	Diff line change
`@@ -5542,7 +5542,7 @@ bool ModelWidget::isNewApi()`
`5542`	`5542`	`QString ModelWidget::getModelTextForOMCUndoCommand()`
`5543`	`5543`	`{`
`5544`	`5544`	`QString oldModelText = mpEditor->getPlainTextEdit()->toPlainText();`
`5545`		`- if (!mpLibraryTreeItem->isTopLevel()) {`
	`5545`	`+ if (!oldModelText.trimmed().startsWith("within") && !mpLibraryTreeItem->isTopLevel()) {`
`5546`	`5546`	`oldModelText = "within " % mpLibraryTreeItem->parent()->getNameStructure() % ";\n" % oldModelText;`
`5547`	`5547`	`}`
`5548`	`5548`	`return oldModelText;`