Skip to content

crash fix for layouts with effects #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CCPNobody merged 1 commit into from
Oct 16, 2026
Merged

crash fix for layouts with effects #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions trinity/Eve/SpaceObjectFactory/EveSOF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4180,23 +4180,28 @@ void EveSOF::CreatePlacement(
fakeContainer.CreateInstance();
SetupEffects( parent, (IEveEffectChildrenOwnerPtr)fakeContainer, extensionDna, placementOffsets, containerPlacementOffsets, buildFlags );

// Snapshot the effects. Strong pointers keep them alive while they are detached from the fake container
std::vector<EveSpaceObjectChildPtr> effects;
effects.reserve( fakeContainer->m_objects.size() );
for( auto& effect : fakeContainer->m_objects )
{
effects.push_back( effect );
}
Comment thread
CCPNobody marked this conversation as resolved.

uint32_t index = 0;
// We need to place the effects under the correct containers
for( auto& effect : fakeContainer->m_objects )
for( auto& effect : effects )
{
fakeContainer->RemoveFromEffectChildrenList( effect );
placementContainers[index++ % placementContainers.size()]->AddToEffectChildrenList( effect );
}
Comment thread
CCPNobody marked this conversation as resolved.
}

if( needsPlacementContainer )
for( auto& placementContainer : placementContainers )
{
for( auto& placementContainer : placementContainers )
if( !placementContainer->Empty() )
{
// we don't really know until now if we have an empty placement container
if( !placementContainer->Empty() )
{
layoutContainer->AddToEffectChildrenList( placementContainer );
}
layoutContainer->AddToEffectChildrenList( placementContainer );
}
}

Expand Down
Loading