Fixed issue #2133 (crash in editor search&replace)

Matthias Koefferlein · Matthias Koefferlein · commit 3b86448a0ab7 · 2025-09-04T21:36:54.000+02:00
diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc
@@ -1401,9 +1401,9 @@ MacroEditorPage::replace_in_selection (const QString &replace, bool first)
     //  restore selection which might have changed due to insert
     c.setPosition (anchor_at_end ? be.position () + pe : bs.position () + ps);
     c.setPosition (!anchor_at_end ? be.position () + pe : bs.position () + ps, QTextCursor::KeepAnchor);
+    mp_text->setTextCursor (c);
   }
 
-  mp_text->setTextCursor (c);
   c.endEditBlock ();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1401,9 +1401,9 @@ MacroEditorPage::replace_in_selection (const QString &replace, bool first)`
`1401`	`1401`	`// restore selection which might have changed due to insert`
`1402`	`1402`	`c.setPosition (anchor_at_end ? be.position () + pe : bs.position () + ps);`
`1403`	`1403`	`c.setPosition (!anchor_at_end ? be.position () + pe : bs.position () + ps, QTextCursor::KeepAnchor);`
	`1404`	`+ mp_text->setTextCursor (c);`
`1404`	`1405`	`}`
`1405`	`1406`
`1406`		`- mp_text->setTextCursor (c);`
`1407`	`1407`	`c.endEditBlock ();`
`1408`	`1408`	`}`
`1409`	`1409`