Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/cbc28d2c9879afea534c5...
...commit
http://git.netsurf-browser.org/netsurf.git/commit/cbc28d2c9879afea534c5f4...
...tree
http://git.netsurf-browser.org/netsurf.git/tree/cbc28d2c9879afea534c5f48c...
The branch, master has been updated
via cbc28d2c9879afea534c5f48cc1fe1d251d2b114 (commit)
from 6b0cb5479faf311d274b1fba23e445f18c0d57a8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=cbc28d2c9879afea534...
commit cbc28d2c9879afea534c5f48cc1fe1d251d2b114
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
html: Also close js thread on html_stop()
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index 871a5e8..f2b898d 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -1642,6 +1642,10 @@ static void html_stop(struct content *c)
/* Still loading; simply flag that we've been aborted
* html_convert/html_finish_conversion will do the rest */
htmlc->aborted = true;
+ if (htmlc->jsthread != NULL) {
+ /* Close the JS thread to cancel out any callbacks */
+ js_closethread(htmlc->jsthread);
+ }
break;
case CONTENT_STATUS_READY:
-----------------------------------------------------------------------
Summary of changes:
content/handlers/html/html.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/content/handlers/html/html.c b/content/handlers/html/html.c
index 871a5e8..f2b898d 100644
--- a/content/handlers/html/html.c
+++ b/content/handlers/html/html.c
@@ -1642,6 +1642,10 @@ static void html_stop(struct content *c)
/* Still loading; simply flag that we've been aborted
* html_convert/html_finish_conversion will do the rest */
htmlc->aborted = true;
+ if (htmlc->jsthread != NULL) {
+ /* Close the JS thread to cancel out any callbacks */
+ js_closethread(htmlc->jsthread);
+ }
break;
case CONTENT_STATUS_READY:
--
NetSurf Browser