Skip to content

Check if the browser is disposed before scheduling runnable in Edge #2408

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
merged 1 commit into from
Aug 11, 2025
Merged

Check if the browser is disposed before scheduling runnable in Edge #2408

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
19 changes: 12 additions & 7 deletions bundles/org.eclipse.swt/Eclipse SWT Browser/win32/org/eclipse/swt/browser/Edge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,7 @@ void browserDispose(Event event) {
if (inCallback > 0) {
ICoreWebView2Controller controller1 = controller;
controller.put_IsVisible(false);
browser.getDisplay().asyncExec(() -> {
asyncExec(() -> {
controller1.Close();
controller1.Release();
});
Expand Down Expand Up @@ -1004,7 +1004,7 @@ private String getExposedUrl(String url) {
}

int handleCloseRequested(long pView, long pArgs) {
browser.getDisplay().asyncExec(() -> {
asyncExec(() -> {
if (browser.isDisposed()) return;
WindowEvent event = new WindowEvent(browser);
event.display = browser.getDisplay();
Expand All @@ -1022,7 +1022,7 @@ int handleDocumentTitleChanged(long pView, long pArgs) {
long[] ppsz = new long[1];
webViewProvider.getWebView(false).get_DocumentTitle(ppsz);
String title = wstrToString(ppsz[0], true);
browser.getDisplay().asyncExec(() -> {
asyncExec(() -> {
if (browser.isDisposed()) return;
TitleEvent event = new TitleEvent(browser);
event.display = browser.getDisplay();
Expand Down Expand Up @@ -1152,7 +1152,7 @@ int handleSourceChanged(long pView, long pArgs) {
} else {
location = url;
}
browser.getDisplay().asyncExec(() -> {
asyncExec(() -> {
if (browser.isDisposed()) return;
LocationEvent event = new LocationEvent(browser);
event.display = browser.getDisplay();
Expand All @@ -1169,7 +1169,7 @@ int handleSourceChanged(long pView, long pArgs) {
}

void sendProgressCompleted() {
browser.getDisplay().asyncExec(() -> {
asyncExec(() -> {
if (browser.isDisposed()) return;
ProgressEvent event = new ProgressEvent(browser);
event.display = browser.getDisplay();
Expand Down Expand Up @@ -1326,7 +1326,7 @@ int handleNavigationCompleted(long pView, long pArgs, boolean top) {
int[] pIsSuccess = new int[1];
args.get_IsSuccess(pIsSuccess);
if (pIsSuccess[0] != 0) {
browser.getDisplay().asyncExec(() -> {
asyncExec(() -> {
if (browser.isDisposed()) return;
LocationEvent event = new LocationEvent(browser);
event.display = browser.getDisplay();
Expand Down Expand Up @@ -1426,12 +1426,17 @@ int handleNewWindowRequested(long pView, long pArgs) {
if (inEvaluate) {
openWindowHandler.run();
} else {
browser.getDisplay().asyncExec(openWindowHandler);
asyncExec(openWindowHandler);
}

return COM.S_OK;
}

private void asyncExec(Runnable r) {
if (browser.isDisposed()) return;
browser.getDisplay().asyncExec(r);
}

int handleGotFocus(long pView, long pArg) {
if (ignoreGotFocus) {
ignoreGotFocus = false;
Expand Down
Loading