From 8d519ba32374672cdbd64e5b7d0af92acc6254c9 Mon Sep 17 00:00:00 2001 From: Kenneth M Date: Wed, 19 Feb 2025 18:23:27 -0600 Subject: [PATCH] Fix on DestroyCamera not targeting defaultCam --- Brio/Game/Camera/VirtualCameraManager.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Brio/Game/Camera/VirtualCameraManager.cs b/Brio/Game/Camera/VirtualCameraManager.cs index dc499e2c..96d49a0f 100644 --- a/Brio/Game/Camera/VirtualCameraManager.cs +++ b/Brio/Game/Camera/VirtualCameraManager.cs @@ -114,13 +114,10 @@ public bool DestroyCamera(int cameraID) { if(_createdCameras.TryGetValue(cameraID, out CameraEntity? camEnt)) { - if(_entityManager.SelectedEntity == camEnt && camEnt.VirtualCamera.IsActiveCamera) + if(_entityManager.TryGetEntity(new Entities.Core.CameraId(0), out var defaultCamEnt) && defaultCamEnt is CameraEntity cameraEnt) { - if(_entityManager.TryGetEntity(new Entities.Core.CameraId(0), out var defaultCamEnt) && defaultCamEnt is CameraEntity cameraEnt) - { - SelectCamera(cameraEnt.VirtualCamera); - _entityManager.SetSelectedEntity(defaultCamEnt); - } + SelectCamera(cameraEnt.VirtualCamera); + _entityManager.SetSelectedEntity(defaultCamEnt); } ent.RemoveChild(camEnt);