Bug fix

donkeyProgramming · Dec 20, 2024 · 6b041b7 · 6b041b7
1 parent 17b4e71
commit 6b041b7
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/Editors/KitbasherEditor/Core/SceneExplorer/MultiSelectTreeView.cs b/Editors/KitbasherEditor/Core/SceneExplorer/MultiSelectTreeView.cs
@@ -56,24 +56,36 @@ public SelectionManager SelectionManager
             set { SetValue(SelectionManagerProperty, value); }
         }
 
-        public static readonly DependencyProperty EventHubProperty = DependencyProperty.Register(nameof(EventHub), typeof(IEventHub), typeof(MultiSelectTreeView), new FrameworkPropertyMetadata(AttemptRegistration));
-        public static readonly DependencyProperty SceneManagerProperty = DependencyProperty.Register(nameof(SceneManager), typeof(SceneManager), typeof(MultiSelectTreeView), new FrameworkPropertyMetadata(AttemptRegistration));
+        public static readonly DependencyProperty EventHubProperty = DependencyProperty.Register(nameof(EventHub), typeof(IEventHub), typeof(MultiSelectTreeView), new FrameworkPropertyMetadata(AttemptRegistrationEventHub));
+        public static readonly DependencyProperty SceneManagerProperty = DependencyProperty.Register(nameof(SceneManager), typeof(SceneManager), typeof(MultiSelectTreeView), new FrameworkPropertyMetadata(AttemptRegistrationSceneManager));
         public static readonly DependencyProperty SelectionManagerProperty = DependencyProperty.Register(nameof(SelectionManager), typeof(SelectionManager), typeof(MultiSelectTreeView));
 
-        private static void AttemptRegistration(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private static void AttemptRegistrationSceneManager(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             (d as MultiSelectTreeView)?.Register();
         }
 
+        private static void AttemptRegistrationEventHub(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var treeView = d as MultiSelectTreeView;
+            if (treeView == null)
+                return;
+
+            treeView.OnRegisterEventHub((IEventHub)e.OldValue, (IEventHub)e.NewValue);
+        }
+
         public MultiSelectTreeView()
         {
             SelectedItemChanged += MyTreeView_SelectedItemChanged;
             Focusable = true;
             PreviewMouseDoubleClick += MultiSelectTreeView_PreviewMouseDoubleClick;
             PreviewMouseRightButtonDown += MultiSelectTreeView_PreviewMouseRightButtonDown;
             ItemsSource = _nodes;
+            Unloaded += MultiSelectTreeView_Unloaded;
         }
 
+        private void MultiSelectTreeView_Unloaded(object sender, RoutedEventArgs e) => Dispose();
+
         private void MultiSelectTreeView_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             var treeViewItem = ItemContainerGeneratorHelper.VisualUpwardSearch(e.OriginalSource as DependencyObject);
@@ -86,16 +98,27 @@ private void MultiSelectTreeView_PreviewMouseRightButtonDown(object sender, Mous
             }
         }
 
+        public void OnRegisterEventHub(IEventHub oldValue, IEventHub newValue)
+        {
+            if (newValue == null && oldValue != null)
+                oldValue.UnRegister(this);
+
+            if (newValue != null)
+            {
+                EventHub.Register<SelectionChangedEvent>(this, SelectionEventHandler);
+                EventHub.Register<SceneObjectAddedEvent>(this, x => RebuildTree());
+                EventHub.Register<SceneObjectRemovedEvent>(this, x => RebuildTree());
+            }
+
+            Register();
+        }
+
 
         public void Register()
         {
             if (SceneManager == null || EventHub == null)
                 return;
 
-            EventHub.Register<SelectionChangedEvent>(this, SelectionEventHandler);
-            EventHub.Register<SceneObjectAddedEvent>(this, x => RebuildTree());
-            EventHub.Register<SceneObjectRemovedEvent>(this, x => RebuildTree());
-
             RebuildTree();
         }
 
@@ -299,6 +322,7 @@ public void Dispose()
             SelectedItemChanged -= MyTreeView_SelectedItemChanged;
             PreviewMouseDoubleClick -= MultiSelectTreeView_PreviewMouseDoubleClick;
             PreviewMouseRightButtonDown -= MultiSelectTreeView_PreviewMouseRightButtonDown;
+            Unloaded -= MultiSelectTreeView_Unloaded;
         }
 
         private static bool IsCtrlPressed

diff --git a/Shared/SharedCore/Services/VersionChecker.cs b/Shared/SharedCore/Services/VersionChecker.cs
@@ -8,7 +8,7 @@ namespace Shared.Core.Services
     public class VersionChecker
     {
         private static readonly string GitHubLink = @"https://github.com/donkeyProgramming/TheAssetEditor/releases/latest";
-        public static string CurrentVersion { get => "0.56"; }
+        public static string CurrentVersion { get => "0.57"; }
 
         public static void CheckVersion()
         {