diff options
| author | Jo Shields <directhex@apebox.org> | 2014-02-19 22:12:43 +0000 |
|---|---|---|
| committer | Jo Shields <directhex@apebox.org> | 2014-02-19 22:12:43 +0000 |
| commit | 9972bf87b4f27d9c8f358ef8414ac1ab957a2f0f (patch) | |
| tree | 5bb230c1d698659115f918e243c1d4b0aa4c7f51 /mcs/class/System/System.ComponentModel | |
| parent | d0a215f5626219ff7927f576588a777e5331c7be (diff) | |
| download | mono-upstream/3.2.8+dfsg.tar.gz | |
Imported Upstream version 3.2.8+dfsgupstream/3.2.8+dfsg
Diffstat (limited to 'mcs/class/System/System.ComponentModel')
| -rw-r--r-- | mcs/class/System/System.ComponentModel/BindingList.cs | 2 | ||||
| -rw-r--r-- | mcs/class/System/System.ComponentModel/Component.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mcs/class/System/System.ComponentModel/BindingList.cs b/mcs/class/System/System.ComponentModel/BindingList.cs index b64d655efe..b4c0ce8b69 100644 --- a/mcs/class/System/System.ComponentModel/BindingList.cs +++ b/mcs/class/System/System.ComponentModel/BindingList.cs @@ -242,7 +242,7 @@ namespace System.ComponentModel { if (raise_list_changed_events) OnListChanged (new ListChangedEventArgs (ListChangedType.ItemAdded, index)); - if (type_raises_item_changed_events) + if (item != null && type_raises_item_changed_events) (item as INotifyPropertyChanged).PropertyChanged += Item_PropertyChanged; } diff --git a/mcs/class/System/System.ComponentModel/Component.cs b/mcs/class/System/System.ComponentModel/Component.cs index 5c61d72eef..1095161648 100644 --- a/mcs/class/System/System.ComponentModel/Component.cs +++ b/mcs/class/System/System.ComponentModel/Component.cs @@ -44,7 +44,7 @@ namespace System.ComponentModel { private EventHandlerList event_handlers; private ISite mySite; - private object disposedEvent = new object (); + static readonly object disposedEvent = new object (); public Component () { |