From 55894dc0d8efe284ae5a0b1a9ac0d538f3e49785 Mon Sep 17 00:00:00 2001 From: HeyImChris <48299693+HeyImChris@users.noreply.github.com> Date: Thu, 13 May 2021 09:28:57 -0700 Subject: [PATCH] Nil check our run loop thread (#771) * Update RCTCxxBridge.mm * Update RCTCxxBridge.mm * run loop nil check Co-authored-by: Chris Hogan --- Libraries/WebSocket/RCTSRWebSocket.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Libraries/WebSocket/RCTSRWebSocket.m b/Libraries/WebSocket/RCTSRWebSocket.m index 0db4d7a9dfaf3f..83aed8d52bfee2 100644 --- a/Libraries/WebSocket/RCTSRWebSocket.m +++ b/Libraries/WebSocket/RCTSRWebSocket.m @@ -530,7 +530,14 @@ - (void)_initializeStreams - (void)_connect { if (!_scheduledRunloops.count) { - [self scheduleInRunLoop:[NSRunLoop RCTSR_networkRunLoop] forMode:NSDefaultRunLoopMode]; + // [TODO(macOS ISS#2323203): `scheduleInRunLoop:forMode:` takes in a non-null run loop parameter so let's be safe and verify that + NSRunLoop *runLoop = [NSRunLoop RCTSR_networkRunLoop]; + if (runLoop != nil) { + [self scheduleInRunLoop:runLoop forMode:NSDefaultRunLoopMode]; + } else { + RCTSRLog(@"Failed connecting to RCTSR_networkRunLoop"); + } + // ]TODO(macOS ISS#2323203) } [_outputStream open];