From b312543d3cc005dc1548775d455848f19719c57a Mon Sep 17 00:00:00 2001 From: zhongwuzw Date: Wed, 27 Mar 2019 20:47:49 -0700 Subject: [PATCH] Ensure runtime established before created contextContainer (#24176) Summary: Ensure bridge finished initialize before we access runtime. cc. shergin. [iOS] [Fixed] - Ensure runtime established before created contextContainer Pull Request resolved: https://github.com/facebook/react-native/pull/24176 Differential Revision: D14660690 Pulled By: shergin fbshipit-source-id: 1d4237a0a344abf32d52243e46f92e346a63e3da --- React/Fabric/RCTSurfacePresenter.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/React/Fabric/RCTSurfacePresenter.mm b/React/Fabric/RCTSurfacePresenter.mm index 42083028e5..13c77871d9 100644 --- a/React/Fabric/RCTSurfacePresenter.mm +++ b/React/Fabric/RCTSurfacePresenter.mm @@ -221,6 +221,11 @@ using namespace facebook::react; _contextContainer->registerInstance(_reactNativeConfig, "ReactNativeConfig"); auto messageQueueThread = _batchedBridge.jsMessageThread; + if (messageQueueThread) { + // Make sure initializeBridge completed + messageQueueThread->runOnQueueSync([] {}); + } + auto runtime = (facebook::jsi::Runtime *)((RCTCxxBridge *)_batchedBridge).runtime; RuntimeExecutor runtimeExecutor =