From 9b5c6f539b0049cbcf12507167eb028013219c45 Mon Sep 17 00:00:00 2001
From: Juan Linietsky <juan@godotengine.org>
Date: Wed, 6 Mar 2019 10:22:38 -0300
Subject: Safer way to update animation if changed, fixes #26670

---
 core/undo_redo.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'core/undo_redo.cpp')

diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp
index 9a10e0585d..e13164d50f 100644
--- a/core/undo_redo.cpp
+++ b/core/undo_redo.cpp
@@ -250,8 +250,9 @@ void UndoRedo::commit_action() {
 	if (action_level > 0)
 		return; //still nested
 
+	commiting++;
 	redo(); // perform action
-
+	commiting--;
 	if (callback && actions.size() > 0) {
 		callback(callback_ud, actions[actions.size() - 1].name);
 	}
@@ -326,12 +327,10 @@ bool UndoRedo::redo() {
 	if ((current_action + 1) >= actions.size())
 		return false; //nothing to redo
 
-	commiting++;
 	current_action++;
 
 	_process_operation_list(actions.write[current_action].do_ops.front());
 	version++;
-	commiting--;
 
 	return true;
 }
@@ -341,11 +340,9 @@ bool UndoRedo::undo() {
 	ERR_FAIL_COND_V(action_level > 0, false);
 	if (current_action < 0)
 		return false; //nothing to redo
-	commiting++;
 	_process_operation_list(actions.write[current_action].undo_ops.front());
 	current_action--;
 	version--;
-	commiting--;
 	return true;
 }
 
-- 
cgit v1.2.3