BrowserItemViewModel dispose

- implement dispose method inside the BrowserItemViewModel to unsubscribe from the ItemsOnCollectionChanged event
dnenov · Nov 22, 2023 · 8096f65 · 8096f65
1 parent b822e2c
commit 8096f65
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -1129,6 +1129,7 @@ internal void ClearSearchResults()
             {
                 ele.RequestDownload -= PackageOnExecuted;
                 ele.RequestShowFileDialog -= OnRequestShowFileDialog;
+                ele?.Dispose();
             }
             this.SearchResults.Clear();
         }

diff --git a/src/DynamoCoreWpf/ViewModels/Search/BrowserItemViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/BrowserItemViewModel.cs
@@ -11,12 +11,12 @@
 using Dynamo.Search.SearchElements;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Extensions;
-using NotificationObject = Dynamo.Core.NotificationObject;
 using Prism.Commands;
+using NotificationObject = Dynamo.Core.NotificationObject;
 
 namespace Dynamo.Wpf.ViewModels
 {
-    public abstract class BrowserItemViewModel : NotificationObject
+    public abstract class BrowserItemViewModel : NotificationObject, IDisposable
     {
         public ICommand ToggleIsExpandedCommand { get; protected set; }
         public BrowserItem Model { get; private set; }
@@ -75,6 +75,11 @@ internal static BrowserInternalElementViewModel WrapExplicit(BrowserInternalElem
             return new BrowserInternalElementViewModel(elem);
         }
 
+        public void Dispose()
+        {
+            Model.Items.CollectionChanged -= ItemsOnCollectionChanged;
+        }
+
         #endregion
 
     }