summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2022-10-16 16:28:22 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2022-10-16 16:28:22 +0100
commit76005e5ff75e1c3f29869cf00232a50a68574711 (patch)
treed3e0bb7e0c4da0d210a85e345fc86295391664b6 /scene
parent3a59c833f1b7e34ddef57522800288a0dee8562d (diff)
Forcibly end current TextEdit action on undo redo
Diffstat (limited to 'scene')
-rw-r--r--scene/gui/text_edit.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp
index 4cd244306c..05d0a6b2fd 100644
--- a/scene/gui/text_edit.cpp
+++ b/scene/gui/text_edit.cpp
@@ -3810,6 +3810,9 @@ void TextEdit::undo() {
return;
}
+ if (in_action) {
+ pending_action_end = true;
+ }
_push_current_op();
if (undo_stack_pos == nullptr) {
@@ -3871,6 +3874,9 @@ void TextEdit::redo() {
return;
}
+ if (in_action) {
+ pending_action_end = true;
+ }
_push_current_op();
if (undo_stack_pos == nullptr) {