fixes brave/browser-laptop#1772

brave · May 19, 2016 · 558e993 · 558e993 · bbondy · May 19, 2016
1 parent 4c1e26a
commit 558e993
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
@@ -231,10 +231,19 @@ void AtomRendererClient::DidCreateScriptContext(
   }
 }
 
+void AtomRendererClient::OnReleaseContext(node::Environment* env) {
+  mate::EmitEvent(env->isolate(), env->process_object(), "exit");
+}
+
 void AtomRendererClient::WillReleaseScriptContext(
     v8::Handle<v8::Context> context) {
-  node::Environment* env = node::Environment::GetCurrent(context);
-  mate::EmitEvent(env->isolate(), env->process_object(), "exit");
+  if (WebContentsPreferences::run_node()) {
+    node::Environment* env = node::Environment::GetCurrent(context);
+    if (env)
+      base::MessageLoop::current()->PostTask(
+        FROM_HERE, base::Bind(&AtomRendererClient::OnReleaseContext,
+          base::Unretained(this), env));
+  }
 }
 
 bool AtomRendererClient::AllowPopup() {

diff --git a/atom/renderer/atom_renderer_client.h b/atom/renderer/atom_renderer_client.h
@@ -17,6 +17,10 @@ namespace extensions {
 class Dispatcher;
 }
 
+namespace node {
+class Environment;
+}
+
 namespace atom {
 
 class AtomBindings;
@@ -80,6 +84,8 @@ class AtomRendererClient : public content::ContentRendererClient,
     const GURL& first_party_for_cookies,
     GURL* new_url) override;
 
+  void OnReleaseContext(node::Environment* env);
+
   scoped_ptr<NodeBindings> node_bindings_;
   scoped_ptr<AtomBindings> atom_bindings_;