mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
Merge pull request #1771 from Azaezel/alpha41/missionMarkerMangle
Some checks are pending
Linux Build / Ubuntu GCC Latest (push) Waiting to run
Linux Build / Ubuntu GCC 13 (push) Waiting to run
MacOSX Build / macOS ARM Clang Ninja (push) Waiting to run
MacOSX Build / macOS ARM Xcode (push) Waiting to run
Windows Build / Windows MSVC Ninja (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2022 (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2026 (push) Waiting to run
Some checks are pending
Linux Build / Ubuntu GCC Latest (push) Waiting to run
Linux Build / Ubuntu GCC 13 (push) Waiting to run
MacOSX Build / macOS ARM Clang Ninja (push) Waiting to run
MacOSX Build / macOS ARM Xcode (push) Waiting to run
Windows Build / Windows MSVC Ninja (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2022 (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2026 (push) Waiting to run
crashfix: make sure mShapeInstance is always assigned valid or NULL
This commit is contained in:
commit
2341db8f63
1 changed files with 1 additions and 1 deletions
|
|
@ -471,7 +471,7 @@ void SpawnSphere::unpackUpdate(NetConnection * con, BitStream * stream)
|
||||||
stream->read(&mSpawnDataBlock);
|
stream->read(&mSpawnDataBlock);
|
||||||
if (oldSDB != mSpawnDataBlock)
|
if (oldSDB != mSpawnDataBlock)
|
||||||
{
|
{
|
||||||
delete mShapeInstance;
|
SAFE_DELETE(mShapeInstance);
|
||||||
ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str()));
|
ShapeBaseData *spawnedDatablock = dynamic_cast<ShapeBaseData *>(Sim::findObject(mSpawnDataBlock.c_str()));
|
||||||
if (spawnedDatablock)
|
if (spawnedDatablock)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue