From fab0d7032025b3fa24c0f43d6940a7a4c233b875 Mon Sep 17 00:00:00 2001 From: Ivan Zlatev Date: Mon, 8 Dec 2008 18:06:58 +0000 Subject: [PATCH] 2008-12-08 Ivan N. Zlatev * DataGridViewRow.cs: Prevent an exception on a not yet databound grid, where datasource is null. [Fixes exception reported in bug 441240] svn path=/trunk/mcs/; revision=121016 --- .../Managed.Windows.Forms/System.Windows.Forms/ChangeLog | 6 ++++++ .../System.Windows.Forms/DataGridViewRow.cs | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog index 026236f86be..eefb2ed7523 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog @@ -1,3 +1,9 @@ +2008-12-08 Ivan N. Zlatev + + * DataGridViewRow.cs: Prevent an exception on a not yet databound grid, + where datasource is null. + [Fixes exception reported in bug 441240] + 2008-12-08 Ivan N. Zlatev * DataGridView.cs: EndEdit validation fixes. diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRow.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRow.cs index ff2c2e9858b..11fb0a79267 100644 --- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRow.cs +++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataGridViewRow.cs @@ -91,7 +91,7 @@ namespace System.Windows.Forms [EditorBrowsable (EditorBrowsableState.Advanced)] public object DataBoundItem { get { - if (base.DataGridView != null) { + if (base.DataGridView != null && DataGridView.DataSource != null) { CurrencyManager data = DataGridView.BindingContext[DataGridView.DataSource] as CurrencyManager; if (data != null && data.List.Count > base.Index) { return data.List[base.Index]; -- 2.25.1