Browse Source

Simplify code a bit.

pull/6485/head
Steven Kirk 5 years ago
parent
commit
1e6155fea3
  1. 20
      src/Avalonia.Controls/ItemsSourceView.cs

20
src/Avalonia.Controls/ItemsSourceView.cs

@ -94,15 +94,9 @@ namespace Avalonia.Controls
{ {
add add
{ {
if (_inner is null) if (_collectionChanged is null && Inner is INotifyCollectionChanged incc)
ThrowDisposed();
if (_collectionChanged is null)
{ {
if (_inner is INotifyCollectionChanged incc) incc.CollectionChanged += OnCollectionChanged;
{
incc.CollectionChanged += OnCollectionChanged;
}
} }
_collectionChanged += value; _collectionChanged += value;
@ -110,17 +104,11 @@ namespace Avalonia.Controls
remove remove
{ {
if (_inner is null)
ThrowDisposed();
_collectionChanged -= value; _collectionChanged -= value;
if (_collectionChanged is null) if (_collectionChanged is null && Inner is INotifyCollectionChanged incc)
{ {
if (_inner is INotifyCollectionChanged incc) incc.CollectionChanged -= OnCollectionChanged;
{
incc.CollectionChanged -= OnCollectionChanged;
}
} }
} }
} }

Loading…
Cancel
Save