Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14016 from xiaofeng11/v3 

Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
This commit is contained in:
pandamicro 2015-10-08 11:12:36 +08:00
parent c787e2c1b0 84347bb056
commit 2dbe0c1a90
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cocos/physics/CCPhysicsWorld.cpp
View File

@ -580,15 +580,19 @@ void PhysicsWorld::removeJoint(PhysicsJoint* joint, bool destroy)
}
joint->_destoryMark = destroy;
bool removedFromDelayAdd = false;
auto it = std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint);
if (it != _delayAddJoints.end())
{
_delayAddJoints.erase(it);
removedFromDelayAdd = true;
}
if (cpSpaceIsLocked(_cpSpace))
{
auto it = std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint);
if (it != _delayAddJoints.end())
{
_delayAddJoints.erase(it);
if (removedFromDelayAdd)
return;
}
if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) == _delayRemoveJoints.rend())
{
_delayRemoveJoints.push_back(joint);
@ -647,11 +651,9 @@ void PhysicsWorld::addJoint(PhysicsJoint* joint)
{
if (joint)
{
if (joint->getWorld() && joint->getWorld() != this)
{
joint->removeFormWorld();
}
CCASSERT(joint->getWorld() == nullptr, "Can not add joint already add to other world!");
joint->_world = this;
auto it = std::find(_delayRemoveJoints.begin(), _delayRemoveJoints.end(), joint);
if (it != _delayRemoveJoints.end())
{

2
tests/performance-tests/Classes/tests/PerformanceParticleTest.cpp
View File

@ -430,7 +430,7 @@ void ParticleMainScene::updateTitle()
////////////////////////////////////////////////////////
std::string ParticlePerformTest1::title() const
{
char str[20] = {0};
char str[32] = {0};
sprintf(str, "A (%d) size=%d", subtestNumber, particleSize);
std::string strRet = str;
return strRet;