Fix destroy shape race condition (#95)

- Fixes #92
appsinacup · May 4, 2024 · 75a9e9f · 75a9e9f
1 parent 8135d01
commit 75a9e9f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/bodies/rapier_collision_object_2d.cpp b/src/bodies/rapier_collision_object_2d.cpp
@@ -29,11 +29,11 @@ void RapierCollisionObject2D::set_shape(int p_index, RapierShape2D *p_shape) {
 
 	Shape &shape = shapes[p_index];
 
-	_destroy_shape(shape, p_index);
-
 	shape.shape->remove_owner(this);
 	shape.shape = p_shape;
 
+	_destroy_shape(shape, p_index);
+
 	p_shape->add_owner(this);
 
 	if (!shape.disabled) {
@@ -97,13 +97,13 @@ void RapierCollisionObject2D::remove_shape(int p_index) {
 
 	Shape &shape = shapes[p_index];
 
+	shape.shape->remove_owner(this);
+	shapes.remove_at(p_index);
+
 	if (!shape.disabled) {
 		_destroy_shape(shape, p_index);
 	}
 
-	shape.shape->remove_owner(this);
-	shapes.remove_at(p_index);
-
 	if (space) {
 		_shapes_changed();
 	}