Skip to content

Commit a50d247

Browse files
authored
Prevent race where devSettings property is called before bridge is do… (#35)
* Prevent race where devSettings property is called before bridge is done initializing and can cause a second bridge to be created. * Changed klass to devSettingsClass
1 parent 983868e commit a50d247

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

React/Modules/RCTDevSettings.mm

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,12 @@ @implementation RCTBridge (RCTDevSettings)
508508
- (RCTDevSettings *)devSettings
509509
{
510510
#if RCT_DEV
511-
return [self moduleForClass:[RCTDevSettings class]];
511+
RCTDevSettings *devSettings = nil; // [TODO(OSS Candidate ISS#2710739)
512+
Class devSettingsClass = [RCTDevSettings class];
513+
if ([self moduleIsInitialized:devSettingsClass]) {
514+
devSettings = [self moduleForClass:devSettingsClass];
515+
}
516+
return devSettings; // ]TODO(OSS Candidate ISS#2710739)
512517
#else
513518
return nil;
514519
#endif

0 commit comments

Comments
 (0)