mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-01-20 04:34:48 +00:00
Merge pull request #55 from DavidWyand-GG/issue54-PhysXCrash
Fix for Issue #54 for PhysX client crash on exit
This commit is contained in:
commit
a59a6ef8b1
|
|
@ -121,6 +121,13 @@ function disconnectedCleanup()
|
|||
// Back to the launch screen
|
||||
if (isObject( MainMenuGui ))
|
||||
Canvas.setContent( MainMenuGui );
|
||||
|
||||
// Before we destroy the client physics world
|
||||
// make sure all ServerConnection objects are deleted.
|
||||
if(isObject(ServerConnection))
|
||||
{
|
||||
ServerConnection.deleteAllObjects();
|
||||
}
|
||||
|
||||
// We can now delete the client physics simulation.
|
||||
physicsDestroyWorld( "client" );
|
||||
|
|
|
|||
|
|
@ -121,6 +121,13 @@ function disconnectedCleanup()
|
|||
// Back to the launch screen
|
||||
if (isObject( MainMenuGui ))
|
||||
Canvas.setContent( MainMenuGui );
|
||||
|
||||
// Before we destroy the client physics world
|
||||
// make sure all ServerConnection objects are deleted.
|
||||
if(isObject(ServerConnection))
|
||||
{
|
||||
ServerConnection.deleteAllObjects();
|
||||
}
|
||||
|
||||
// We can now delete the client physics simulation.
|
||||
physicsDestroyWorld( "client" );
|
||||
|
|
|
|||
|
|
@ -222,6 +222,13 @@ function disconnectedCleanup()
|
|||
Canvas.setContent( MainMenuGui );
|
||||
else if (isObject( UnifiedMainMenuGui ))
|
||||
Canvas.setContent( UnifiedMainMenuGui );
|
||||
|
||||
// Before we destroy the client physics world
|
||||
// make sure all ServerConnection objects are deleted.
|
||||
if(isObject(ServerConnection))
|
||||
{
|
||||
ServerConnection.deleteAllObjects();
|
||||
}
|
||||
|
||||
// We can now delete the client physics simulation.
|
||||
physicsDestroyWorld( "client" );
|
||||
|
|
|
|||
|
|
@ -222,6 +222,13 @@ function disconnectedCleanup()
|
|||
Canvas.setContent( MainMenuGui );
|
||||
else if (isObject( UnifiedMainMenuGui ))
|
||||
Canvas.setContent( UnifiedMainMenuGui );
|
||||
|
||||
// Before we destroy the client physics world
|
||||
// make sure all ServerConnection objects are deleted.
|
||||
if(isObject(ServerConnection))
|
||||
{
|
||||
ServerConnection.deleteAllObjects();
|
||||
}
|
||||
|
||||
// We can now delete the client physics simulation.
|
||||
physicsDestroyWorld( "client" );
|
||||
|
|
|
|||
Loading…
Reference in a new issue