From d3e326897fd393e01e46e3ed4a5b1c046350c972 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Mon, 14 Sep 2020 14:08:46 -0700 Subject: [PATCH 1/2] fix: call node::Stop on exit (#25430) --- shell/app/node_main.cc | 1 + shell/browser/electron_browser_main_parts.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc index 22e39b6e2f186..c3b79f55ab542 100644 --- a/shell/app/node_main.cc +++ b/shell/app/node_main.cc @@ -153,6 +153,7 @@ int NodeMain(int argc, char* argv[]) { exit_code = node::EmitExit(env); env->set_can_call_into_js(false); + node::Stop(env); node::RunAtExit(env); v8::Isolate* isolate = env->isolate(); diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc index 8f07a01d3d63e..eec282830dacb 100644 --- a/shell/browser/electron_browser_main_parts.cc +++ b/shell/browser/electron_browser_main_parts.cc @@ -553,6 +553,7 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() { // invoke Node/V8 APIs inside them. node_debugger_->Stop(); node_env_->env()->set_trace_sync_io(false); + node::Stop(node_env_->env()); node_env_.reset(); js_env_->OnMessageLoopDestroying(); From 8e57a60799b51171fee771932fdcf67343509430 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Wed, 16 Sep 2020 17:43:15 -0700 Subject: [PATCH 2/2] Update node_main.cc --- shell/app/node_main.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/shell/app/node_main.cc b/shell/app/node_main.cc index c3b79f55ab542..0e984f35808f8 100644 --- a/shell/app/node_main.cc +++ b/shell/app/node_main.cc @@ -152,7 +152,6 @@ int NodeMain(int argc, char* argv[]) { env->set_trace_sync_io(false); exit_code = node::EmitExit(env); - env->set_can_call_into_js(false); node::Stop(env); node::RunAtExit(env);