From 96cf9bb0c039785fa35dd3f88d7c3598de5ca93e Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Wed, 2 Nov 2016 14:24:42 -0700 Subject: [PATCH] Support null messageQueueThread in JSCExecutor Reviewed By: michalgr Differential Revision: D4119253 fbshipit-source-id: 2956434451bf4e649cfe4c0ee0a9b7339a5422a3 --- ReactCommon/cxxreact/JSCExecutor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ReactCommon/cxxreact/JSCExecutor.cpp b/ReactCommon/cxxreact/JSCExecutor.cpp index b49e9d8ee43..5e1aae7ae7c 100644 --- a/ReactCommon/cxxreact/JSCExecutor.cpp +++ b/ReactCommon/cxxreact/JSCExecutor.cpp @@ -201,9 +201,13 @@ JSCExecutor::~JSCExecutor() { void JSCExecutor::destroy() { *m_isDestroyed = true; - m_messageQueueThread->runOnQueueSync([this] () { + if (m_messageQueueThread.get()) { + m_messageQueueThread->runOnQueueSync([this] () { + terminateOnJSVMThread(); + }); + } else { terminateOnJSVMThread(); - }); + } } void JSCExecutor::setContextName(const std::string& name) {