Skip to content
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

Jump to bottom

Avoid race-condition where layers are loading and populating as map starts up. #519

Merged
merged 1 commit into from
Jul 26, 2023
Merged

Avoid race-condition where layers are loading and populating as map starts up. #519

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
26 changes: 13 additions & 13 deletions src/Toolkit/Toolkit/LayerContentDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,18 @@ private IEnumerable<Action> TrackLayerContentsRecursive(IEnumerable<ILayerConten
{
if (layers != null)
{
foreach (var layer in layers)
if (layers is INotifyCollectionChanged incc)
{
var listener = new WeakEventListener<LayerContentDataSource<T>, INotifyCollectionChanged, object?, NotifyCollectionChangedEventArgs>(this, incc)
{
OnEventAction = static (instance, source, eventArgs) => instance.Layers_CollectionChanged(source, eventArgs),
OnDetachAction = static (instance, source, weakEventListener) => source.CollectionChanged -= weakEventListener.OnEvent,
};
incc.CollectionChanged += listener.OnEvent;
yield return listener.Detach;
}

foreach (var layer in layers.ToArray())
{
if (layer is INotifyPropertyChanged inpc)
{
Expand All @@ -375,22 +386,11 @@ private IEnumerable<Action> TrackLayerContentsRecursive(IEnumerable<ILayerConten
yield return listener.Detach;
}

foreach (var sublayerAction in TrackLayerContentsRecursive(layer.SublayerContents))
foreach (var sublayerAction in TrackLayerContentsRecursive(layer.SublayerContents).ToArray())
{
yield return sublayerAction;
}
}

if (layers is INotifyCollectionChanged incc)
{
var listener = new WeakEventListener<LayerContentDataSource<T>, INotifyCollectionChanged, object?, NotifyCollectionChangedEventArgs>(this, incc)
{
OnEventAction = static (instance, source, eventArgs) => instance.Layers_CollectionChanged(source, eventArgs),
OnDetachAction = static (instance, source, weakEventListener) => source.CollectionChanged -= weakEventListener.OnEvent,
};
incc.CollectionChanged += listener.OnEvent;
yield return listener.Detach;
}
}
}

Expand Down
Loading