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

Merge pull request #833 from just-bank/fix-derefptr

Browse source 
Fix: Null'ed pointer usage, possible access violation.
This commit is contained in:
Daniel Buckmaster 2014-10-16 10:38:52 +11:00
commit 1554ea6faf
3 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/debris.cpp
View file

@ -659,11 +659,7 @@ void Debris::onRemove()
} }
} }
if( getSceneManager() ) removeFromScene();
getSceneManager()->removeObjectFromScene(this);
if( getContainer() )
getContainer()->removeObject(this);
Parent::onRemove(); Parent::onRemove();
} }

5
Engine/source/T3D/fx/explosion.cpp
View file

@ -964,10 +964,7 @@ void Explosion::onRemove()
mMainEmitter = NULL; mMainEmitter = NULL;
} }
if (getSceneManager() != NULL) removeFromScene();
getSceneManager()->removeObjectFromScene(this);
if (getContainer() != NULL)
getContainer()->removeObject(this);
Parent::onRemove(); Parent::onRemove();
} }

6
Engine/source/T3D/fx/splash.cpp
View file

@ -415,11 +415,7 @@ void Splash::onRemove()
ringList.clear(); ringList.clear();
if( getSceneManager() ) removeFromScene();
getSceneManager()->removeObjectFromScene(this);
if( getContainer() )
getContainer()->removeObject(this);
Parent::onRemove(); Parent::onRemove();
} }