diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm index ccce3b2931f..ac619af21a5 100644 --- a/React/CoreModules/RCTDevSettings.mm +++ b/React/CoreModules/RCTDevSettings.mm @@ -12,14 +12,14 @@ #import #import #import +#import +#import #import #import #import #import #import -#import - #import "CoreModulesPlugins.h" static NSString *const kRCTDevSettingProfilingEnabled = @"profilingEnabled"; @@ -114,7 +114,7 @@ void RCTDevSettingsSetEnabled(BOOL enabled) @end -@interface RCTDevSettings () { +@interface RCTDevSettings () { BOOL _isJSLoaded; #if ENABLE_PACKAGER_CONNECTION RCTHandlerToken _reloadToken; @@ -128,6 +128,8 @@ void RCTDevSettingsSetEnabled(BOOL enabled) @implementation RCTDevSettings +@synthesize bundleURL = _bundleURL; + RCT_EXPORT_MODULE() - (instancetype)init @@ -243,7 +245,12 @@ RCT_EXPORT_MODULE() - (BOOL)isHotLoadingAvailable { - return self.bridge.bundleURL && !self.bridge.bundleURL.fileURL; // Only works when running from server + if (self.bridge.bundleURL) { + return !self.bridge.bundleURL.fileURL; // Only works when running from server + } else if (self.bundleURL) { + return !self.bundleURL.fileURL; + } + return NO; } RCT_EXPORT_METHOD(reload)