Add _isReleasingDataSource to prevent unnecessary operations on CurrentCell when changing or releasing DataSource #13320
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ntCell when changing or releasing DataSource
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #13320 +/- ##
===================================================
- Coverage 62.56333% 62.56145% -0.00188%
===================================================
Files 1560 1560
Lines 159675 159675
Branches 14904 14904
===================================================
- Hits 99898 99895 -3
- Misses 59008 59011 +3
Partials 769 769
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
There was a problem hiding this comment.
Pull Request Overview
This PR prevents unnecessary operations on CurrentCell when changing or releasing DataSource by introducing a new flag.
- Added a private flag (_isReleasingDataSource) to signal when DataSource is being released.
- Wrapped the CurrentCell update in a try-finally block to maintain flag integrity.
- Updated the SetCurrentCellAddressCore method to check the new flag and prevent calling EndEdit unnecessarily.
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| DataGridView.cs | Introduced _isReleasingDataSource and updated the DataSource setter to use a try-finally block when setting CurrentCell. |
| DataGridView.Methods.cs | Modified the condition in SetCurrentCellAddressCore to skip EndEdit when _isReleasingDataSource is true. |
Tanya-Solyanik
added
the
waiting-for-testing
| @@ -345,6 +345,7 @@ private const DataGridViewAutoSizeRowCriteriaInternal InvalidDataGridViewAutoSiz | |||
| private int _inBulkPaintCount; | |||
| private int _inBulkLayoutCount; | |||
| private int _inPerformLayoutCount; | |||
| private bool _isReleasingDataSource; | |||
There was a problem hiding this comment.
Can we add another bit flag to this field _dataGridViewOper instead of a new bool?
Tanya-Solyanik
added
the
waiting-author-feedback
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #13304
Root cause
Regression introduced in PR #4637
When closing the dialog in edit mode,
DataSourceis set to null, and thenCurrentCell = nullis set. Then unnecessary methodEndEditof theSetCurrentCellAddressCoreis called.Proposed changes
_isReleasingDataSourcein DataGridView and set it to null in propertyDataSourcebefore settingCurrentCell = nullto prevent theEndEditmethod of the SetCurrentCellAddressCore from being calledCustomer Impact
Regression?
Risk
Screenshots
Before
When a dialog with a DataGridView that has focus is closed, an
System.InvalidOperationException: Operation is not valid because it results in a reentrant call to the SetCurrentCellAddressCore function.is thrownDataGridViewCrash.mp4
After
The DataGridView dialog with focus can be closed successfully
Test methodology
Test environment(s)
Microsoft Reviewers: Open in CodeFlow