Skip to content

fix: Check Intptr and HwndSource isn't Zero before using in TitleBar #1447

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
pomianowski merged 1 commit into from
Jun 11, 2025
+12 −3
Merged

fix: Check Intptr and HwndSource isn't Zero before using in TitleBar #1447

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
15 changes: 12 additions & 3 deletions src/Wpf.Ui/Controls/TitleBar/TitleBar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ private void OnTemplateButtonClick(TitleBarButtonType buttonType)
}

/// <summary>
/// Listening window hooks after rendering window content to SizeToContent support
/// Listening window hooks after rendering window content to SizeToContent support
/// </summary>
private void OnWindowContentRendered(object? sender, EventArgs e)
{
Expand All @@ -607,8 +607,17 @@ private void OnWindowContentRendered(object? sender, EventArgs e)
window.ContentRendered -= OnWindowContentRendered;

IntPtr handle = new WindowInteropHelper(window).Handle;
HwndSource windowSource =
HwndSource.FromHwnd(handle) ?? throw new InvalidOperationException("Window source is null");
if (handle == IntPtr.Zero)
{
return;
}

HwndSource? windowSource = HwndSource.FromHwnd(handle);
if (windowSource == null)
{
return;
}

windowSource.AddHook(HwndSourceHook);
}

Expand Down
Loading