Merge commit '1390aa6f9142787a953baf7989be1353c6c17350'

Mirroring · Mirroring · commit ee12dd5000bd · 2025-05-08T00:53:32.000Z
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs b/src/System.Windows.Forms/src/System/Windows/Forms/Controls/DataGridView/DataGridView.Methods.cs
@@ -27484,7 +27484,8 @@ protected virtual bool SetCurrentCellAddressCore(int columnIndex,
             {
                 int oldCurrentCellX = _ptCurrentCell.X;
                 int oldCurrentCellY = _ptCurrentCell.Y;
-                if (oldCurrentCellX >= 0
+                if (IsHandleCreated
+                    && oldCurrentCellX >= 0
                     && !_dataGridViewState1[State1_TemporarilyResetCurrentCell]
                     && !_dataGridViewOper[OperationInDispose])
                 {

Original file line number	Diff line number	Diff line change
`@@ -27484,7 +27484,8 @@ protected virtual bool SetCurrentCellAddressCore(int columnIndex,`
`27484`	`27484`	`{`
`27485`	`27485`	`int oldCurrentCellX = _ptCurrentCell.X;`
`27486`	`27486`	`int oldCurrentCellY = _ptCurrentCell.Y;`
`27487`		`- if (oldCurrentCellX >= 0`
	`27487`	`+ if (IsHandleCreated`
	`27488`	`+ && oldCurrentCellX >= 0`
`27488`	`27489`	`&& !_dataGridViewState1[State1_TemporarilyResetCurrentCell]`
`27489`	`27490`	`&& !_dataGridViewOper[OperationInDispose])`
`27490`	`27491`	`{`