natsirt/noggit-red
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug where loading a tile while doing an actino adds the tiles objects to the action stack, and cause a crash when undoing that action

Browse Source
This commit is contained in:
T1ti
2024-07-18 19:26:08 +02:00
parent b4c411311e
commit 04b993b6d5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/noggit/world_model_instances_storage.cpp
View File

@@ -46,8 +46,10 @@ namespace Noggit
} }
else if(!unsafe_uid_is_used(uid)) else if(!unsafe_uid_is_used(uid))
{ {
/* This causes a crash when undoing while loading a tile, those objects get registered to the action stack
if (NOGGIT_CUR_ACTION) if (NOGGIT_CUR_ACTION)
NOGGIT_CUR_ACTION->registerObjectAdded(&instance); NOGGIT_CUR_ACTION->registerObjectAdded(&instance);
*/
_m2s.emplace(uid, instance); _m2s.emplace(uid, instance);
_instance_count_per_uid[uid] = 1; _instance_count_per_uid[uid] = 1;
return uid; return uid;
@@ -95,8 +97,10 @@ namespace Noggit
} }
else if (!unsafe_uid_is_used(uid)) else if (!unsafe_uid_is_used(uid))
{ {
/*
if (NOGGIT_CUR_ACTION) if (NOGGIT_CUR_ACTION)
NOGGIT_CUR_ACTION->registerObjectAdded(&instance); NOGGIT_CUR_ACTION->registerObjectAdded(&instance);
*/
_wmos.emplace(uid, instance); _wmos.emplace(uid, instance);
_instance_count_per_uid[uid] = 1; _instance_count_per_uid[uid] = 1;
return uid; return uid;