X Tutup
Skip to content

[Windows] Fix icon leak.#114525

Merged
Repiteo merged 1 commit intogodotengine:masterfrom
bruvzg:icon_free
Jan 5, 2026
Merged

[Windows] Fix icon leak.#114525
Repiteo merged 1 commit intogodotengine:masterfrom
bruvzg:icon_free

Conversation

@bruvzg
Copy link
Member

@bruvzg bruvzg commented Jan 2, 2026

Fixes #114496
Supersede #113421
Bugsquad edit: Should also fix #113350

@RPicster
Copy link
Contributor

RPicster commented Jan 2, 2026

Tested it locally, it works - thanks for the fix!

@bruvzg bruvzg marked this pull request as ready for review January 5, 2026 07:55
@bruvzg bruvzg requested a review from a team as a code owner January 5, 2026 07:55
Copy link
Contributor

@Maran23 Maran23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, just one question.

// Set the icon in the task manager (should we do this?).
SendMessage(windows[MAIN_WINDOW_ID].hWnd, WM_SETICON, ICON_BIG, (LPARAM)hicon);
for (const KeyValue<WindowID, WindowData> &E : windows) {
SendMessage(E.value.hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_big);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question just to be sure: This should use icon_big and not icon_small, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is generated icon, so the same is used for both, icon_small is not set in this case.

@Repiteo Repiteo merged commit 4cfda98 into godotengine:master Jan 5, 2026
20 checks passed
@Repiteo
Copy link
Contributor

Repiteo commented Jan 5, 2026

Thanks!

rivie13 pushed a commit to rivie13/Phoenix-Agentic-Engine that referenced this pull request Feb 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

GDI object leak on Windows with embed_subwindows = false Windows display server crash with Parameter "hicon" is null. error spam

5 participants

X Tutup