Merge pull request #91123 from aaronp64/multi_viewport_crash

Fix `SubViewport`/`AudioStreamPlayer2D` crash
godotengine · Sep 3, 2024 · a8337da · a8337da
2 parents 49ed6c5 + 7a9acd5
commit a8337da
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -5048,6 +5048,9 @@ Viewport::~Viewport() {
 	for (ViewportTexture *E : viewport_textures) {
 		E->vp = nullptr;
 	}
+	if (world_2d.is_valid()) {
+		world_2d->remove_viewport(this);
+	}
 	ERR_FAIL_NULL(RenderingServer::get_singleton());
 	RenderingServer::get_singleton()->free(viewport);
 }