From e2a8b56aad64a5da1962331648c75871eb111b96 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Fri, 15 Oct 2021 09:18:12 +0200
Subject: [PATCH] Unsubscribe from ItemsSourceView before disposing it.

---
 src/Avalonia.Controls/Repeater/ItemsRepeater.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
index 01200e87e37..0ff8fcbd280 100644
--- a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
+++ b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -588,14 +588,14 @@ private void OnDataSourcePropertyChanged(ItemsSourceView oldValue, ItemsSourceVi
                 throw new AvaloniaInternalException("Cannot set ItemsSourceView during layout.");
             }
 
-            ItemsSourceView?.Dispose();
-            ItemsSourceView = newValue;
-
             if (oldValue != null)
             {
                 oldValue.CollectionChanged -= OnItemsSourceViewChanged;
             }
 
+            ItemsSourceView?.Dispose();
+            ItemsSourceView = newValue;
+
             if (newValue != null)
             {
                 newValue.CollectionChanged += OnItemsSourceViewChanged;