Skip to content
Snippets Groups Projects
Commit 648f020d authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Don't clear the console-abort flag upon return from executing a JS module

This completes the revert of commit c22063f9 from (Jun-2-2016). The Baja
part of that commit was reverted in commit 932fae30 (Nov-15-2016). This
behavior has proven to be surprising and annoying for JS mod developers
(e.g. the yesnobar.js and Nightfox's file searcher/scanner).

If we still need clearing of abort status after running JS "externals",
that should probably be done in exec_xtrn(), not here.
parent d56a62dc
Branches
Tags
No related merge requests found
Pipeline #5182 passed
......@@ -674,7 +674,7 @@ int sbbs_t::js_execfile(const char *cmd, const char* startup_dir, JSObject* scop
js_callback.listeners = NULL;
JS_ExecuteScript(js_cx, js_scope, js_script, &rval);
js_handle_events(js_cx, &js_callback, &terminated);
sys_status &=~ SS_ABORT;
// sys_status &=~ SS_ABORT;
JS_GetProperty(js_cx, js_scope, "exit_code", &rval);
if(rval!=JSVAL_VOID)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment