summaryrefslogtreecommitdiff
path: root/core/undo_redo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/undo_redo.cpp')
-rw-r--r--core/undo_redo.cpp7
1 files changed, 2 insertions, 5 deletions
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;
}