Changeset 5068

Timestamp:

12/07/10 16:46:54 (14 years ago)

Author:

abeham

Message:

#1324

• Fixed event (de)registration in ItemCollectionView

File:

• trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -55 +55 @@
       Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<T>(Content_ItemsRemoved);
       Content.CollectionReset -= new CollectionItemsChangedEventHandler<T>(Content_CollectionReset);
+      foreach (T item in listViewItemMapping.Keys) {
+        item.ItemImageChanged -= new EventHandler(Item_ItemImageChanged);
+        item.ToStringChanged -= new EventHandler(Item_ToStringChanged);
+      }
       base.DeregisterContentEvents();
     }
@@ -126 +130 @@
       T item = (listViewItem.Tag as T);
       itemsListView.Items.Add(listViewItem);
-      item.ItemImageChanged += new EventHandler(Item_ItemImageChanged);
-      item.ToStringChanged += new EventHandler(Item_ToStringChanged);
-      if (!listViewItemMapping.ContainsKey(item))
+      if (!listViewItemMapping.ContainsKey(item)) {
+        item.ItemImageChanged += new EventHandler(Item_ItemImageChanged);
+        item.ToStringChanged += new EventHandler(Item_ToStringChanged);
         listViewItemMapping.Add(item, new List<ListViewItem>());
+      }
       listViewItemMapping[item].Add(listViewItem);
       sortAscendingButton.Enabled = itemsListView.Items.Count > 1;