GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on end play when one of the actors has been manually disabled

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-04 15:56:56 +02:00
parent 31a6c052f3
commit a8c6b2b619
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Source/Engine/Level/Actor.cpp
View File

@@ -802,18 +802,7 @@ void Actor::Initialize()
void Actor::BeginPlay(SceneBeginData* data) void Actor::BeginPlay(SceneBeginData* data)
{ {
// Perform additional verification
ASSERT(!IsDuringPlay()); ASSERT(!IsDuringPlay());
#if BUILD_DEBUG
for (int32 i = 0; i < Children.Count(); i++)
{
ASSERT(Children[i]->IsDuringPlay() == IsDuringPlay());
}
for (int32 i = 0; i < Scripts.Count(); i++)
{
ASSERT(Scripts[i]->IsDuringPlay() == IsDuringPlay());
}
#endif
// Set flag // Set flag
Flags |= ObjectFlags::IsDuringPlay; Flags |= ObjectFlags::IsDuringPlay;
@@ -843,18 +832,7 @@ void Actor::BeginPlay(SceneBeginData* data)
void Actor::EndPlay() void Actor::EndPlay()
{ {
// Perform additional verification
ASSERT(IsDuringPlay()); ASSERT(IsDuringPlay());
#if BUILD_DEBUG
for (int32 i = 0; i < Children.Count(); i++)
{
ASSERT(Children[i]->IsDuringPlay() == IsDuringPlay());
}
for (int32 i = 0; i < Scripts.Count(); i++)
{
ASSERT(Scripts[i]->IsDuringPlay() == IsDuringPlay());
}
#endif
// Fire event for scripting // Fire event for scripting
if (IsActiveInHierarchy() && GetScene()) if (IsActiveInHierarchy() && GetScene())
@@ -871,7 +849,8 @@ void Actor::EndPlay()
// Call event deeper // Call event deeper
for (int32 i = 0; i < Children.Count(); i++) for (int32 i = 0; i < Children.Count(); i++)
{ {
Children[i]->EndPlay(); if (Children[i]->IsDuringPlay())
Children[i]->EndPlay();
} }
// Fire event for scripting // Fire event for scripting
@@ -886,7 +865,8 @@ void Actor::EndPlay()
// Inform attached scripts // Inform attached scripts
for (int32 i = 0; i < Scripts.Count(); i++) for (int32 i = 0; i < Scripts.Count(); i++)
{ {
Scripts[i]->EndPlay(); if (Scripts[i]->IsDuringPlay())
Scripts[i]->EndPlay();
} }
// Cleanup managed object // Cleanup managed object