From: Anthony Minessale Date: Tue, 15 Jul 2008 19:41:56 +0000 (+0000) Subject: update X-Git-Tag: v1.0.1~122 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b24a17cf271bf8399f8d4ecf99d9115b1bac3b0c;p=thirdparty%2Ffreeswitch.git update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9045 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index 3fb664858a..cd3b9c15e8 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -1148,11 +1148,10 @@ static switch_status_t js_common_callback(switch_core_session_t *session, void * return SWITCH_STATUS_FALSE; } - if (check_hangup_hook(jss, &cb_state->ret) == JS_TRUE) { + if (check_hangup_hook(jss, NULL) == JS_TRUE) { JS_ResumeRequest(cb_state->cx, cb_state->saveDepth); JS_CallFunction(cb_state->cx, cb_state->obj, cb_state->function, argc, argv, &cb_state->ret); cb_state->saveDepth = JS_SuspendRequest(cb_state->cx); - check_hangup_hook(jss, &cb_state->ret); jss->stack_depth--; } @@ -1483,12 +1482,12 @@ static JSBool session_collect_input(JSContext * cx, JSObject * obj, uintN argc, if (check_hangup_hook(jss, NULL) != JS_TRUE) { return JS_FALSE; + } switch_ivr_collect_digits_callback(jss->session, &args, to); check_hangup_hook(jss, &ret); JS_ResumeRequest(cx, cb_state.saveDepth); - *rval = cb_state.ret; return ret;