Skip to content

[servicing6.0*] Fixing incorrect state set for State.Created flag on the Control #6482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dreddy-work merged 1 commit into from
Jan 10, 2022
+1 −4
Merged

[servicing6.0*] Fixing incorrect state set for State.Created flag on the Control #6482

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/System.Windows.Forms/src/System/Windows/Forms/Control.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9806,9 +9806,6 @@ internal virtual void RecreateHandleCore()
// the call shouldn't fail.
// However, it could fail if this.CreateParams.Parent is changed outside our control.
CreateHandle();

// DestroyHandle resets the state, but CreateHandle doesn't set the state back.
SetState(States.Created, true);
}
catch (Exception)
{
Expand Down Expand Up @@ -9838,7 +9835,7 @@ internal virtual void RecreateHandleCore()
// - or -
// CreateHandle is successful.
// We will move the child controls to the new parent.
if (controlSnapshot is not null && GetState(States.Created))
if (controlSnapshot is not null && IsHandleCreated)
{
for (int i = 0; i < controlSnapshot.Length; i++)
{
Expand Down