From 8d69094cf22fb4c4bf31c549fe10bc7bc9b22fc4 Mon Sep 17 00:00:00 2001 From: Antoine Pilote Date: Thu, 5 Sep 2024 21:49:11 -0400 Subject: [PATCH] Prevented crash on isValid on entity entity --- Nuake/src/FileSystem/FileSystem.cpp | 1 - Nuake/src/Scene/Entities/Entity.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Nuake/src/FileSystem/FileSystem.cpp b/Nuake/src/FileSystem/FileSystem.cpp index 57856d0b..fde1b000 100644 --- a/Nuake/src/FileSystem/FileSystem.cpp +++ b/Nuake/src/FileSystem/FileSystem.cpp @@ -276,7 +276,6 @@ std::string FileSystem::GetFileNameFromPath(const std::string& path) return String::Split(split[split.size() - 1], '.')[0]; } - Directory::Directory(const std::string& path) { Files = std::vector>(); diff --git a/Nuake/src/Scene/Entities/Entity.h b/Nuake/src/Scene/Entities/Entity.h index 41461b1b..9be35965 100644 --- a/Nuake/src/Scene/Entities/Entity.h +++ b/Nuake/src/Scene/Entities/Entity.h @@ -28,7 +28,7 @@ namespace Nuake bool IsValid() const { - return m_Scene->m_Registry.valid((entt::entity)GetHandle()); + return m_EntityHandle != (entt::entity)-1 && m_Scene->m_Registry.valid((entt::entity)GetHandle()); } template