[Editor] Preview View Model was not properly removing event handlers (f…

…ixes #438)
stride3d · May 4, 2019 · 6b3df88 · 6b3df88
1 parent a8f4db9
commit 6b3df88
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/sources/editor/Xenko.GameStudio/PreviewViewModel.cs b/sources/editor/Xenko.GameStudio/PreviewViewModel.cs
@@ -65,10 +65,14 @@ private void Cleanup()
                 previewService.PreviewAssetUpdated -= PreviewAssetUpdated;
                 previewService.Dispose();
             }
+
+            session.ActiveAssetView.SelectedAssets.CollectionChanged -= SelectedAssetsCollectionChanged;
+            session.ActiveAssetsChanged -= ActiveAssetsChanged;
         }
 
         private void ActiveAssetsChanged(object sender, ActiveAssetsChangedArgs e)
         {
+            EnsureNotDestroyed(nameof(PreviewViewModel));
             PreviewService?.SetAssetToPreview(e.Assets.Count == 1 ? e.Assets.First() : null);
         }
 
@@ -79,6 +83,7 @@ private void PreviewAssetUpdated(object sender, EventArgs e)
 
         private void SelectedAssetsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
+            EnsureNotDestroyed(nameof(PreviewViewModel));
             if (PreviewService == null)
                 return;