mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-21 16:12:40 +08:00
Fix crash if closing app in SpineAttach test case. (#11901)
* Fix crash if closing app in SpineAttach test case.
This commit is contained in:
@@ -30,12 +30,14 @@
|
||||
namespace se {
|
||||
|
||||
// NativePtrToObjectMap
|
||||
NativePtrToObjectMap::Map *NativePtrToObjectMap::__nativePtrToObjectMap = nullptr;
|
||||
NativePtrToObjectMap::Map *NativePtrToObjectMap::__nativePtrToObjectMap = nullptr; // NOLINT
|
||||
bool NativePtrToObjectMap::__isValid = false; // NOLINT
|
||||
|
||||
bool NativePtrToObjectMap::init() {
|
||||
if (__nativePtrToObjectMap == nullptr)
|
||||
if (__nativePtrToObjectMap == nullptr) {
|
||||
__nativePtrToObjectMap = ccnew NativePtrToObjectMap::Map();
|
||||
|
||||
}
|
||||
__isValid = true;
|
||||
return __nativePtrToObjectMap != nullptr;
|
||||
}
|
||||
|
||||
@@ -44,6 +46,11 @@ void NativePtrToObjectMap::destroy() {
|
||||
delete __nativePtrToObjectMap;
|
||||
__nativePtrToObjectMap = nullptr;
|
||||
}
|
||||
__isValid = false;
|
||||
}
|
||||
|
||||
bool NativePtrToObjectMap::isValid() {
|
||||
return __isValid;
|
||||
}
|
||||
|
||||
void NativePtrToObjectMap::emplace(void *nativeObj, Object *seObj) {
|
||||
|
||||
@@ -40,6 +40,8 @@ public:
|
||||
static bool init();
|
||||
static void destroy();
|
||||
|
||||
static bool isValid();
|
||||
|
||||
static Map::iterator find(void *nativeObj);
|
||||
static Map::iterator erase(Map::iterator iter);
|
||||
static void erase(void *nativeObj);
|
||||
@@ -53,7 +55,8 @@ public:
|
||||
|
||||
private:
|
||||
static void emplace(void *nativeObj, Object *seObj);
|
||||
static Map *__nativePtrToObjectMap;
|
||||
static Map *__nativePtrToObjectMap; // NOLINT
|
||||
static bool __isValid; // NOLINT
|
||||
|
||||
friend class Object;
|
||||
};
|
||||
|
||||
@@ -431,9 +431,10 @@ bool register_all_dragonbones_manual(se::Object *obj) {
|
||||
|
||||
dragonBones::BaseObject::setObjectRecycleOrDestroyCallback([](dragonBones::BaseObject *obj, int type) {
|
||||
//ccstd::string typeName = typeid(*obj).name();
|
||||
|
||||
if (!se::NativePtrToObjectMap::isValid()) {
|
||||
return;
|
||||
}
|
||||
se::Object *seObj = nullptr;
|
||||
|
||||
auto iter = se::NativePtrToObjectMap::find(obj);
|
||||
if (iter != se::NativePtrToObjectMap::end()) {
|
||||
// Save se::Object pointer for being used in cleanup method.
|
||||
|
||||
@@ -230,6 +230,9 @@ bool register_all_spine_manual(se::Object *obj) {
|
||||
ns->defineFunction("disposeSkeletonData", _SE(js_register_spine_disposeSkeletonData));
|
||||
|
||||
spine::setSpineObjectDisposeCallback([](void *spineObj) {
|
||||
if (!se::NativePtrToObjectMap::isValid()) {
|
||||
return;
|
||||
}
|
||||
// Support Native Spine fo Creator V3.0
|
||||
se::Object *seObj = nullptr;
|
||||
auto iter = se::NativePtrToObjectMap::find(spineObj);
|
||||
|
||||
Reference in New Issue
Block a user