summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2015-08-13 09:39:04 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2015-08-13 09:39:04 +0100
commit2d53524635c6fbc7eba339d1c3901b485fc4ec16 (patch)
tree3d396945c8c6ee5af7e340c3a7d86e9851d2d9db
parent526b0e3bb4102f618795266cf5eed459e73dc18b (diff)
downloadnetsurf-2d53524635c6fbc7eba339d1c3901b485fc4ec16.tar.gz
netsurf-2d53524635c6fbc7eba339d1c3901b485fc4ec16.tar.bz2
Fix crash when JS context is required from a frame.
-rw-r--r--desktop/browser.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 2d7257bd4..5f488002e 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -794,11 +794,6 @@ nserror browser_window_create(enum browser_window_create_flags flags,
return NSERROR_NOMEM;
}
- /* new javascript context for window */
- ret->jsctx = js_newcontext(nsoption_int(script_timeout),
- slow_script,
- NULL);
-
/* Initialise common parts */
err = browser_window_initialise_common(flags, ret, existing);
if (err != NSERROR_OK) {
@@ -858,6 +853,12 @@ nserror browser_window_initialise_common(enum browser_window_create_flags flags,
nserror err;
assert(bw);
+ /* new javascript context for each window/frame
+ * TODO: is this correct? */
+ bw->jsctx = js_newcontext(nsoption_int(script_timeout),
+ slow_script,
+ NULL);
+
if (flags & BW_CREATE_CLONE) {
assert(existing != NULL);