asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix UndoRedo crash when clearing history

Browse source 
(cherry picked from commit c3baf83e28)
This commit is contained in:
Haoyu Qiu 2021-07-24 00:53:58 +08:00 • committed by Rémi Verschelde
parent 49f323410b
commit 329df4e404
No known key found for this signature in database
GPG key ID: C3336907360768E1
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/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);
}
} }
} }
} }
@ -221,9 +225,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);
}
} }
} }
} }