Skip to content

Fix new problem with LT-22520: Crash when using Find window #963

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
jtmaxwell3 merged 1 commit into from
Jun 24, 2026
Merged

Fix new problem with LT-22520: Crash when using Find window #963

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
9 changes: 8 additions & 1 deletion Src/xWorks/GeneratedHtmlViewer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,10 @@ private void OnDomKeyPress(object sender, DomKeyEventArgs e)
}
private void FindDialog_FormClosing(object sender, FormClosingEventArgs e)
{
if (m_htmlControl?.Browser?.Window == null)
{
return;
}
using (var executor = new AutoJSContext(m_htmlControl.Browser.Window))
{
// Javascript query to execute in the browser
Expand Down Expand Up @@ -1102,8 +1106,11 @@ private void FindNextInBrowser(object sender, IBasicFindView view)

private void FindInBrowser(bool forward)
{
if (geckoBrowser == null)
if (geckoBrowser?.Window == null)
{
Close();
return;
}
int originalResultIndex = resultIndex;
using (var executor = new AutoJSContext(geckoBrowser.Window))
{
Expand Down
Loading