godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UndoRedo crash when clearing history

This commit is contained in:
Haoyu Qiu 2021-07-24 00:53:58 +08:00
parent d17201afc2
commit c3baf83e28
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/object/undo_redo.cpp
View File

@ -41,9 +41,13 @@ void UndoRedo::_discard_redo() {
for (int i = current_action + 1; i < actions.size(); i++) { for (int i = current_action + 1; i < actions.size(); i++) {
for (List<Operation>::Element *E = actions.write[i].do_ops.front(); E; E = E->next()) { for (List<Operation>::Element *E = actions.write[i].do_ops.front(); E; E = E->next()) {
if (E->get().type == Operation::TYPE_REFERENCE) { if (E->get().type == Operation::TYPE_REFERENCE) {
Object *obj = ObjectDB::get_instance(E->get().object); if (E->get().ref.is_valid()) {
if (obj) { E->get().ref.unref();
memdelete(obj); } else {
Object *obj = ObjectDB::get_instance(E->get().object);
if (obj) {
memdelete(obj);
}
} }
} }
} }
@ -242,9 +246,13 @@ void UndoRedo::_pop_history_tail() {
for (List<Operation>::Element *E = actions.write[0].undo_ops.front(); E; E = E->next()) { for (List<Operation>::Element *E = actions.write[0].undo_ops.front(); E; E = E->next()) {
if (E->get().type == Operation::TYPE_REFERENCE) { if (E->get().type == Operation::TYPE_REFERENCE) {
Object *obj = ObjectDB::get_instance(E->get().object); if (E->get().ref.is_valid()) {
if (obj) { E->get().ref.unref();
memdelete(obj); } else {
Object *obj = ObjectDB::get_instance(E->get().object);
if (obj) {
memdelete(obj);
}
} }
} }
} }