From c8ef15cf4040989c170eb7280546080deae021d9 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Fri, 2 Mar 2018 15:58:51 -0800 Subject: [PATCH] update node::Environment::TickInfo calls --- atom/common/api/atom_bindings.cc | 6 +++--- vendor/node | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/atom/common/api/atom_bindings.cc b/atom/common/api/atom_bindings.cc index a41f2eebddd1..2411d5a11950 100644 --- a/atom/common/api/atom_bindings.cc +++ b/atom/common/api/atom_bindings.cc @@ -103,11 +103,11 @@ void AtomBindings::OnCallNextTick(uv_async_t* handle) { if (callback_scope.in_makecallback()) continue; node::Environment::TickInfo* tick_info = env->tick_info(); - if (tick_info->length() == 0) + if (!tick_info->has_scheduled()) env->isolate()->RunMicrotasks(); v8::Local process = env->process_object(); - if (tick_info->length() == 0) - tick_info->set_index(0); + if (!tick_info->has_scheduled()) + return; env->tick_callback_function()->Call(process, 0, nullptr).IsEmpty(); } diff --git a/vendor/node b/vendor/node index 86c3cc8a38a1..9c2b9b16af48 160000 --- a/vendor/node +++ b/vendor/node @@ -1 +1 @@ -Subproject commit 86c3cc8a38a15a05a05c8a256eb72013cd240e78 +Subproject commit 9c2b9b16af48f33d2fa73bab30206ba5b15d9dde