TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-20 04:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update simObject.h

Browse source 
scope error
This commit is contained in:
marauder2k7 2026-02-24 00:39:02 +00:00
parent cc6a1c0932
commit 14b5c7221d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/console/simObject.h
View file

@ -1069,25 +1069,25 @@ protected:
void set(T* obj)
{
// Nothing to do if same object
if (obj && mWeak.lock().get() == obj->getWeakControl().lock().get())
if (obj && this->mWeak.lock() == obj->getWeakControl().lock())
return;
// Before overwriting, check old object for auto-delete
if (auto old_ctrl = mWeak.lock())
if (auto old_ctrl = this->mWeak.lock())
{
T* old_obj = getObject();
if (mWeak.use_count() == 1 && old_obj && old_obj->isAutoDeleted())
if (this->mWeak.use_count() == 1 && old_obj && old_obj->isAutoDeleted())
{
old_obj->destroySelf();
}
}
// Assign new weak reference
mWeak.reset();
this->mWeak.reset();
if (obj)
{
auto obj_ctrl = obj->getWeakControl().lock();
mWeak = obj_ctrl;
this->mWeak = obj_ctrl;
}
}
};