diff options
author | Bruno Dilly <bdilly@profusion.mobi> | 2012-10-04 22:39:53 +0000 |
---|---|---|
committer | Bruno Dilly <bdilly@profusion.mobi> | 2012-10-04 22:39:53 +0000 |
commit | 7d994cc8e6dab084df9d38daa61d5c41c8c45904 (patch) | |
tree | 95a8711e36868a645178772b0fd0b778aa57cfb6 /legacy | |
parent | 7fe038a1c8d480e91664df68809b122791ab7fe7 (diff) |
ephysics: don't try to lock on internal delete
SVN revision: 77464
Diffstat (limited to 'legacy')
-rw-r--r-- | legacy/ephysics/src/lib/ephysics_body.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/legacy/ephysics/src/lib/ephysics_body.cpp b/legacy/ephysics/src/lib/ephysics_body.cpp index 30df114..803b138 100644 --- a/legacy/ephysics/src/lib/ephysics_body.cpp +++ b/legacy/ephysics/src/lib/ephysics_body.cpp | |||
@@ -808,7 +808,9 @@ _ephysics_body_soft_add(EPhysics_World *world, btCollisionShape *collision_shape | |||
808 | body = _ephysics_body_add(world, collision_shape, "soft box", 0.5, 0.5); | 808 | body = _ephysics_body_add(world, collision_shape, "soft box", 0.5, 0.5); |
809 | if (!body) | 809 | if (!body) |
810 | { | 810 | { |
811 | ephysics_body_del(body); | 811 | if (body->deleted) return NULL; |
812 | body->deleted = EINA_TRUE; | ||
813 | ephysics_world_body_del(body->world, body); | ||
812 | return NULL; | 814 | return NULL; |
813 | } | 815 | } |
814 | body->soft_body = soft_body; | 816 | body->soft_body = soft_body; |