summaryrefslogtreecommitdiff
path: root/desktop/browser.c
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2013-05-22 18:40:21 +0100
committerVincent Sanders <vince@netsurf-browser.org>2013-05-22 19:12:26 +0100
commitaf75070bee41816cb9ee4a53995d1f42870c1fcb (patch)
treeed7cae70d8f650c563292376ba4fde0bf44a8fad /desktop/browser.c
parent7f7ff937453dc70144d1b6226fb7b34368ab271d (diff)
downloadnetsurf-af75070bee41816cb9ee4a53995d1f42870c1fcb.tar.gz
netsurf-af75070bee41816cb9ee4a53995d1f42870c1fcb.tar.bz2
add script_timeout option and use it
Diffstat (limited to 'desktop/browser.c')
-rw-r--r--desktop/browser.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 53e3f13bf..ac8c6991c 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -683,12 +683,15 @@ void browser_window_debug_dump(struct browser_window *bw, FILE *f)
content_debug_dump(bw->current_content, f);
}
-static bool gui_slow_script(void *ctx)
+/** slow script handler
+*/
+static bool slow_script(void *ctx)
{
static int count = 0;
LOG(("Continuing execution %d", count));
count++;
- if (count >= 2) {
+ if (count > 1) {
+ count = 0;
return false;
}
return true;
@@ -717,7 +720,9 @@ browser_window_create(enum browser_window_nav_flags flags,
}
/* new javascript context for window */
- bw->jsctx = js_newcontext(10, gui_slow_script, NULL);
+ bw->jsctx = js_newcontext(nsoption_int(script_timeout),
+ slow_script,
+ NULL);
/* Initialise common parts */
browser_window_initialise_common(bw, clone);