Merge commit 'a29c04aaaa1ddf27eb7f81d925246a01eac52e89'

Mirroring · Mirroring · commit 6f5606c76ef1 · 2025-05-08T00:53:26.000Z
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs b/src/System.Windows.Forms/src/System/Windows/Forms/DataGridView.Methods.cs
@@ -27460,7 +27460,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
`@@ -27460,7 +27460,8 @@ protected virtual bool SetCurrentCellAddressCore(int columnIndex,`
`27460`	`27460`	`{`
`27461`	`27461`	`int oldCurrentCellX = _ptCurrentCell.X;`
`27462`	`27462`	`int oldCurrentCellY = _ptCurrentCell.Y;`
`27463`		`- if (oldCurrentCellX >= 0 &&`
	`27463`	`+ if (IsHandleCreated &&`
	`27464`	`+ oldCurrentCellX >= 0 &&`
`27464`	`27465`	`!_dataGridViewState1[State1_TemporarilyResetCurrentCell] &&`
`27465`	`27466`	`!_dataGridViewOper[OperationInDispose])`
`27466`	`27467`	`{`